Merge remote-tracking branch 'origin/master' into mantidpython_python3

Framework/API/CMakeLists.txt

Framework/API/inc/MantidAPI/DetectorInfo.h

Framework/API/inc/MantidAPI/ExperimentInfo.h

Framework/API/inc/MantidAPI/MatrixWorkspace.h

Framework/API/inc/MantidAPI/SpectrumInfo.h

Framework/API/src/DetectorInfo.cpp

Framework/API/src/ExperimentInfo.cpp

Framework/API/src/FileBackedExperimentInfo.cpp

Framework/API/src/IFunction.cpp

Framework/API/src/MatrixWorkspace.cpp

Framework/API/src/SpectrumInfo.cpp

Framework/API/test/DetectorInfoTest.h

Framework/API/test/MatrixWorkspaceTest.h

Framework/API/test/SpectrumInfoTest.h

Framework/Algorithms/inc/MantidAlgorithms/ApplyCalibration.h

Framework/Algorithms/src/ApplyCalibration.cpp

Framework/Algorithms/src/CalculateCountRate.cpp

Framework/Algorithms/src/CompareWorkspaces.cpp

Framework/Algorithms/src/CopyInstrumentParameters.cpp

Framework/Algorithms/src/DetectorEfficiencyCor.cpp