Merge remote branch 'origin/bugfix/6798_qtassistant_installed'
Merge remote branch 'origin/feature/6749_import_fp_irf'
Refs #6544 Compounds for SetSampleMaterial
Refs #6544 chemical formula output correct
Refs #6544 test add and formula documentation
Refs #6544 remove extra character
Refs #6544 print parsing output from Windows
Refs #6544 fix test for windows?
Refs #6544 fix test for windows?
Refs #6544 commented failing tests
Refs #6544 try tests again
Refs #6544 comment tests again
Refs #6544 try windows again
Refs #6544 uncomment tests again
Refs #6544 remove comment in test
Merge remote branch 'origin/feature/6544_Absorption_Corrections_Materials'
Merge remote branch 'origin/feature/6793_setGoniometer_improvement'
Merge branch 'master' into bugfix/6678_ISISLiveData. Re #6678.

Conflicts:
	Code/Mantid/Framework/DataHandling/src/ISISHistoDataListener.cpp
Merge branch 'bugfix/6678_ISISLiveData' into develop. Re #6678.

Conflicts:
	Code/Mantid/Framework/DataHandling/src/ISISHistoDataListener.cpp