Merge branch 'stable-1.1'

Conflicts:
	include/lmms_math.h
	plugins/delay/delaycontrolsdialog.cpp
	src/core/FxMixer.cpp
	src/gui/FxMixerView.cpp

src/core/Engine.cpp

@@ -115,6 +115,7 @@ void Engine::init( const bool _has_gui )
 
 void Engine::destroy()
 {
+	s_projectJournal->stopAllJournalling();
 	s_mixer->stopProcessing();
 
 	deleteHelper( &s_projectNotes );