Merge remote-tracking branch 'origin/master' into feature/10383_fits_workspace
Refs #10383 fixing a few errors
Refs #10383 fixing a few errors
Revert "Revert "Merge branch 'feature/10383_fits_workspace' into develop""

This reverts commit 5656a7acddca118a902ccb85ed41899f20d5ccd0.
Merge branch 'feature/10383_fits_workspace' into develop
Refs #10383 fixing a few errors
Merge branch 'develop' of github.com:mantidproject/mantid into develop