Merge remote-tracking branch 'origin/feature/8243_fix_browse_to_default_save_dir'
Merge remote-tracking branch 'origin/master' into feature/7505_sinq_code_check

Conflicts:
	Code/Mantid/Framework/DataHandling/CMakeLists.txt
Merge branch 'feature/7505_sinq_code_check' into develop