Re #10119. Adding conflict with ipython>=2.0
Merge branch 'feature/10119_mantid_dev_spec' into develop