Conflicts: src/Magnum/AbstractTexture.cpp src/Magnum/Context.cpp src/Magnum/CubeMapTexture.h src/Magnum/CubeMapTextureArray.h src/Magnum/Magnum.h src/Magnum/MeshTools/Duplicate.h src/Magnum/Platform/Sdl2Application.h src/Magnum/SceneGraph/Object.hpp src/Magnum/Shader.cpp src/Magnum/Shapes/Test/ShapeTest.cpp src/Magnum/Test/AbstractShaderProgramTest.cpp src/Magnum/Test/ColorTest.cpp