Merge branch 'feature/8131_calc_corr_update' of github.com:mantidproject/mantid into feature/8131_calc_corr_update
Merge branch 'feature/8131_calc_corr_update' into develop