Merge remote-tracking branch 'origin/feature/8441_rm_poldipeakfit'
Merge remote-tracking branch 'origin/bugfix/8768_convfit_file_loading_issues'
Merge remote-tracking branch 'origin/master' into

feature/8392_bayes_add_sample_logs
Refs #8392

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectBayes.py
Merge branch 'feature/8392_bayes_add_sample_logs' into develop