Refs #9970 Merge branch 'master' into feature branch

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/MantidMatrix.cpp
Merge branch 'feature/9970_refactor_project_serialisation' into develop

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