Merge branch 'master' into compatibility

src/Shaders/MeshVisualizer.cpp

@@ -83,12 +83,13 @@ MeshVisualizer::MeshVisualizer(const Flags flags): flags(flags), transformationP
     #endif
     {
         bindAttributeLocation(Position::Location, "position");
+
         #ifndef MAGNUM_TARGET_GLES
-        if(v < Version::GL310)
-        #else
-        if(v < Version::GLES300)
+        if(!Context::current()->isVersionSupported(Version::GL310))
         #endif
+        {
             bindAttributeLocation(VertexIndex::Location, "vertexIndex");
+        }
     }
 
     CORRADE_INTERNAL_ASSERT_OUTPUT(link());

src/Shapes/shapeImplementation.h

@@ -108,7 +108,7 @@ template<UnsignedInt dimensions> struct TypeOf<Shapes::Box<dimensions>> {
     }
 };
 template<> struct TypeOf<Shapes::Plane> {
-    constexpr static typename ShapeDimensionTraits<3>::Type type() {
+    constexpr static ShapeDimensionTraits<3>::Type type() {
         return ShapeDimensionTraits<3>::Type::Plane;
     }
 };