Re #8686. Fixing bug found in testing.
Merge branch 'feature/8686_mantidplot_returns' into develop