Merge branch 'stable-1.1'

Conflicts:
	src/core/main.cpp
	src/gui/MainWindow.cpp

plugins/sf2_player/sf2_player.cpp

@@ -522,6 +522,8 @@ void sf2Instrument::updateSampleRate()
 	}
 	updateReverb();
 	updateChorus();
+	updateReverbOn();
+	updateChorusOn();
 }