refs #4843 Solves merge conflict
Merge branch 'master' of github.com:mantidproject/mantid
Merge branch 'master' of github.com:mantidproject/mantid
Merge branch 'master' of github.com:mantidproject/mantid
Merge branch 'master' into feature/4843_load_logs
Merge branch 'feature/4843_load_logs' into develop