Merge remote-tracking branch 'origin/feature/7373_peaks_layout_widget'
Merge branch 'master' of https://github.com/mantidproject/mantid