Pull in changes from mantid branch