Merge remote-tracking branch 'origin/bugfix/8798_convfit_fit_output'
Merge remote-tracking branch 'origin/feature/8347_upgrade_jumpfit'
Merge remote-tracking branch 'origin/feature/8805_antialiasing_on_mtd_graphs'
Merge branch 'master' into feature/8392_bayes_add_sample_logs

Refs #8392

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

Refs #8392

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectJumpFit.py