Merge branch 'master' into bugfix/10707_startup_dialog_z_order

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.ui
Refs #10707