Merge remote-tracking branch 'origin/bugfix/9514_geometry_occ_warnings'
Merge remote-tracking branch 'origin/feature/9519_fix_divide_properly'
Merge remote-tracking branch 'origin/bugfix/7521_slow_unit_tests'
Merge remote branch 'origin/feature/9095_estimate_resolution'
Merge remote branch 'origin/master' into feature/9357_eliminate_managedworkspaces

Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadRaw3.cpp
	Code/Mantid/Framework/DataHandling/test/LoadRaw3Test.h
	Code/Mantid/Framework/DataObjects/test/ManagedWorkspace2DTest.h
Merge branch 'feature/9357_eliminate_managedworkspaces' into develop