Merge branch 'feature/6177_script_repo_mantidplot' of https://github.com/mantidproject/mantid
Merge remote-tracking branch 'origin/feature/6449_fixMDBoxSplittingPerformance'
Merge branch 'master' of https://github.com/mantidproject/mantid
Merge remote-tracking branch 'origin/feature/6754_manual_peaks_with_UB'
Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h
Merge branch 'feature/6160_mask_tab' into develop