Merge remote-tracking branch 'origin/master' into feature/5116_fit_with_graph_toolbar

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
Merge branch 'feature/5116_fit_with_graph_toolbar' into develop