Merge branch 'master' into feature/6160_mask_tab. Re #6160.

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp
Enable/disable buttons based on the state of mask. Re #6160
Merge branch 'feature/6160_mask_tab' into develop