Merge branch 'master' of github.com:mantidproject/mantid into 13989_measurement_info

Conflicts:
	MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h
	MantidQt/CustomInterfaces/src/QtReflMainView.cpp