Merge remote-tracking branch 'origin/feature/863_reflectometry_fitting'
Merge branch 'master' of https://github.com/mantidproject/mantid