Merge remote-tracking branch 'origin/feature/8213_Dont_crash_with_empty_logs'
Merge remote-tracking branch 'origin/feature/7925_indirect_undocumented_workflow_algs'
Merge branch 'master' into feature/7614_interface_categories

Refs #7614.

Conflicts:
	Code/Mantid/MantidPlot/src/ApplicationWindow.h
Merge branch 'feature/7614_interface_categories' into develop

Refs #7614.

Conflicts:
	Code/Mantid/MantidPlot/src/ApplicationWindow.h