Merge remote-tracking branch 'origin/master'

into feature/8031_workspace_in_sample_log_name

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp

Refs #8031
Merge branch 'feature/8031_workspace_in_sample_log_name' into develop

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp

Refs #8031