Merge remote-tracking branch 'origin/feature/6780_asym_stopped_working'
Merge remote-tracking branch 'origin/feature/6455_expose_det_group_sep'
Merge remote-tracking branch 'origin/feature/6454_scriptwindow_codefolding'
Merge remote-tracking branch 'origin/feature/6742_maps_d4window'
Merge remote-tracking branch 'origin/feature/6630_launch_qtassistant'
Merge remote-tracking branch 'origin/feature/5885_history_bad_paths'
Merge remote-tracking branch 'origin/feature/6550_OptCrystPos'
Make function not to inherit from IPeakFunction.  Refs #6716.
Change category to general.  Refs #6716.
Merge branch 'feature/6764_calibrate_inst_func' of https://github.com/mantidproject/mantid
refs #6764 Windows compiler warnings (probably not ticket related)
refs #6785 Avoids merge conflict
Merge branch 'feature/6785_hide_live_algorithms', remote-tracking branch 'origin'
Fix qtassistant packaging on Windows. Refs #6795
Merge branch 'bugfix/6795_qtassistant_packaging' into develop