Re #9336 fix conflict with master
Re #9336 fix conflict with develop
Merge branch 'develop' of github.com:mantidproject/mantid into develop