Merge branch 'master' of github.com:mantidproject/mantid into 14923_unit_tests_for_cropped_calib_engg_gui