Merge remote-tracking branch 'origin/feature/8135_pyzmq_win_debug'
Merge remote-tracking branch 'origin/feature/8380_icat_centre_gui'
Merge remote-tracking branch 'origin/feature/8381_python_peaks_presenter'
Merge remote-tracking branch 'origin/feature/8418_cppcheck_performance'
Merge remote-tracking branch 'origin/bugfix/8387_Quasi_multi_runs'
Merge remote-tracking branch 'origin/feature/8437_cppcheck_style'
Merge remote-tracking branch 'origin/master' into feature/8445_icat_refactor_algorithms. Refs #8445

Conflicts:
	Code/Mantid/Framework/ICat/src/CatalogLogin.cpp
	Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/CatalogHelper.h
Merge branch 'feature/8445_icat_refactor_algorithms' into develop