diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp
index 9d756d8b..432a6b99 100644
--- a/glm/core/type_mat2x2.hpp
+++ b/glm/core/type_mat2x2.hpp
@@ -133,19 +133,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x2<T> & operator=(tmat2x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x2<T> & operator+=(U const & s);
+		GLM_FUNC_DECL tmat2x2<T> & operator+=(U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x2<T> & operator+=(tmat2x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x2<T> & operator-=(U const & s);
+		GLM_FUNC_DECL tmat2x2<T> & operator-=(U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x2<T> & operator-=(tmat2x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x2<T> & operator*=(U const & s);
+		GLM_FUNC_DECL tmat2x2<T> & operator*=(U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x2<T> & operator*=(tmat2x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x2<T> & operator/=(U const & s);
+		GLM_FUNC_DECL tmat2x2<T> & operator/=(U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x2<T> & operator/=(tmat2x2<U> const & m);
 		GLM_FUNC_DECL tmat2x2<T> & operator++();
diff --git a/glm/core/type_mat2x2.inl b/glm/core/type_mat2x2.inl
index 4c7249d5..9d6e1911 100644
--- a/glm/core/type_mat2x2.inl
+++ b/glm/core/type_mat2x2.inl
@@ -306,10 +306,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator+=
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -330,10 +327,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator-=
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -354,10 +348,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -376,10 +367,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x2<T>& tmat2x2<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp
index beb58179..14f1548b 100644
--- a/glm/core/type_mat2x3.hpp
+++ b/glm/core/type_mat2x3.hpp
@@ -123,19 +123,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x3<T> & operator=  (tmat2x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x3<T> & operator+= (U const & s);
+		GLM_FUNC_DECL tmat2x3<T> & operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x3<T> & operator+= (tmat2x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x3<T> & operator-= (U const & s);
+		GLM_FUNC_DECL tmat2x3<T> & operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x3<T> & operator-= (tmat2x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x3<T> & operator*= (U const & s);
+		GLM_FUNC_DECL tmat2x3<T> & operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x3<T> & operator*= (tmat2x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x3<T> & operator/= (U const & s);
+		GLM_FUNC_DECL tmat2x3<T> & operator/= (U s);
 
 		GLM_FUNC_DECL tmat2x3<T> & operator++ ();
 		GLM_FUNC_DECL tmat2x3<T> & operator-- ();
diff --git a/glm/core/type_mat2x3.inl b/glm/core/type_mat2x3.inl
index 4644c1b2..b77f4fa0 100644
--- a/glm/core/type_mat2x3.inl
+++ b/glm/core/type_mat2x3.inl
@@ -293,10 +293,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x3<T> & tmat2x3<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x3<T> & tmat2x3<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -317,10 +314,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x3<T>& tmat2x3<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x3<T>& tmat2x3<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -341,10 +335,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x3<T>& tmat2x3<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x3<T>& tmat2x3<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -363,10 +354,7 @@ namespace detail
 
 	template <typename T>
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x3<T> & tmat2x3<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x3<T> & tmat2x3<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp
index 04f824c6..c3357009 100644
--- a/glm/core/type_mat2x4.hpp
+++ b/glm/core/type_mat2x4.hpp
@@ -125,19 +125,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x4<T>& operator=  (tmat2x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x4<T>& operator+= (U const & s);
+		GLM_FUNC_DECL tmat2x4<T>& operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x4<T>& operator+= (tmat2x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x4<T>& operator-= (U const & s);
+		GLM_FUNC_DECL tmat2x4<T>& operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x4<T>& operator-= (tmat2x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x4<T>& operator*= (U const & s);
+		GLM_FUNC_DECL tmat2x4<T>& operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat2x4<T>& operator*= (tmat2x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat2x4<T>& operator/= (U const & s);
+		GLM_FUNC_DECL tmat2x4<T>& operator/= (U s);
 
 		GLM_FUNC_DECL tmat2x4<T>& operator++ ();
 		GLM_FUNC_DECL tmat2x4<T>& operator-- ();
diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl
index d324b580..598bddc3 100644
--- a/glm/core/type_mat2x4.inl
+++ b/glm/core/type_mat2x4.inl
@@ -296,10 +296,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x4<T>& tmat2x4<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x4<T>& tmat2x4<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -320,10 +317,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x4<T>& tmat2x4<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x4<T>& tmat2x4<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -344,10 +338,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x4<T>& tmat2x4<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x4<T>& tmat2x4<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -366,10 +357,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat2x4<T> & tmat2x4<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat2x4<T> & tmat2x4<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp
index d3663647..06a3228f 100644
--- a/glm/core/type_mat3x2.hpp
+++ b/glm/core/type_mat3x2.hpp
@@ -131,19 +131,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x2<T> & operator=  (tmat3x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x2<T> & operator+= (U const & s);
+		GLM_FUNC_DECL tmat3x2<T> & operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x2<T> & operator+= (tmat3x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x2<T> & operator-= (U const & s);
+		GLM_FUNC_DECL tmat3x2<T> & operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x2<T> & operator-= (tmat3x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x2<T> & operator*= (U const & s);
+		GLM_FUNC_DECL tmat3x2<T> & operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x2<T> & operator*= (tmat3x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x2<T> & operator/= (U const & s);
+		GLM_FUNC_DECL tmat3x2<T> & operator/= (U s);
 
 		GLM_FUNC_DECL tmat3x2<T> & operator++ ();
 		GLM_FUNC_DECL tmat3x2<T> & operator-- ();
diff --git a/glm/core/type_mat3x2.inl b/glm/core/type_mat3x2.inl
index a4da3dbc..7d7e16e6 100644
--- a/glm/core/type_mat3x2.inl
+++ b/glm/core/type_mat3x2.inl
@@ -317,10 +317,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x2<T>& tmat3x2<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x2<T>& tmat3x2<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -343,10 +340,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x2<T>& tmat3x2<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x2<T>& tmat3x2<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -369,10 +363,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x2<T>& tmat3x2<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x2<T>& tmat3x2<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -392,10 +383,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x2<T> & tmat3x2<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x2<T> & tmat3x2<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat3x3.hpp b/glm/core/type_mat3x3.hpp
index aa988ae0..b2122d8e 100644
--- a/glm/core/type_mat3x3.hpp
+++ b/glm/core/type_mat3x3.hpp
@@ -137,19 +137,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x3<T>& operator=  (tmat3x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x3<T>& operator+= (U const & s);
+		GLM_FUNC_DECL tmat3x3<T>& operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x3<T>& operator+= (tmat3x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x3<T>& operator-= (U const & s);
+		GLM_FUNC_DECL tmat3x3<T>& operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x3<T>& operator-= (tmat3x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x3<T>& operator*= (U const & s);
+		GLM_FUNC_DECL tmat3x3<T>& operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x3<T>& operator*= (tmat3x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x3<T>& operator/= (U const & s);
+		GLM_FUNC_DECL tmat3x3<T>& operator/= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x3<T>& operator/= (tmat3x3<U> const & m);
 		GLM_FUNC_DECL tmat3x3<T>& operator++ ();
diff --git a/glm/core/type_mat3x3.inl b/glm/core/type_mat3x3.inl
index 005ddd5d..73731e9e 100644
--- a/glm/core/type_mat3x3.inl
+++ b/glm/core/type_mat3x3.inl
@@ -320,10 +320,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -346,10 +343,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -372,10 +366,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -395,10 +386,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x3<T> & tmat3x3<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp
index e880834d..8fe31060 100644
--- a/glm/core/type_mat3x4.hpp
+++ b/glm/core/type_mat3x4.hpp
@@ -131,19 +131,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x4<T> & operator=  (tmat3x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x4<T> & operator+= (U const & s);
+		GLM_FUNC_DECL tmat3x4<T> & operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x4<T> & operator+= (tmat3x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x4<T> & operator-= (U const & s);
+		GLM_FUNC_DECL tmat3x4<T> & operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x4<T> & operator-= (tmat3x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x4<T> & operator*= (U const & s);
+		GLM_FUNC_DECL tmat3x4<T> & operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat3x4<T> & operator*= (tmat3x4<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat3x4<T> & operator/= (U const & s);
+		GLM_FUNC_DECL tmat3x4<T> & operator/= (U s);
 
 		GLM_FUNC_DECL tmat3x4<T> & operator++ ();
 		GLM_FUNC_DECL tmat3x4<T> & operator-- ();
diff --git a/glm/core/type_mat3x4.inl b/glm/core/type_mat3x4.inl
index 4a55a012..be613d06 100644
--- a/glm/core/type_mat3x4.inl
+++ b/glm/core/type_mat3x4.inl
@@ -316,10 +316,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x4<T>& tmat3x4<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x4<T>& tmat3x4<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -342,10 +339,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x4<T>& tmat3x4<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x4<T>& tmat3x4<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -368,10 +362,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x4<T>& tmat3x4<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x4<T>& tmat3x4<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -391,10 +382,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat3x4<T> & tmat3x4<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat3x4<T> & tmat3x4<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp
index 01d61718..3bc6cc00 100644
--- a/glm/core/type_mat4x2.hpp
+++ b/glm/core/type_mat4x2.hpp
@@ -136,19 +136,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x2<T>& operator=  (tmat4x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x2<T>& operator+= (U const & s);
+		GLM_FUNC_DECL tmat4x2<T>& operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x2<T>& operator+= (tmat4x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x2<T>& operator-= (U const & s);
+		GLM_FUNC_DECL tmat4x2<T>& operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x2<T>& operator-= (tmat4x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x2<T>& operator*= (U const & s);
+		GLM_FUNC_DECL tmat4x2<T>& operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x2<T>& operator*= (tmat4x2<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x2<T>& operator/= (U const & s);
+		GLM_FUNC_DECL tmat4x2<T>& operator/= (U s);
 
 		GLM_FUNC_DECL tmat4x2<T>& operator++ ();
 		GLM_FUNC_DECL tmat4x2<T>& operator-- ();
diff --git a/glm/core/type_mat4x2.inl b/glm/core/type_mat4x2.inl
index 64d4758a..3f65e63b 100644
--- a/glm/core/type_mat4x2.inl
+++ b/glm/core/type_mat4x2.inl
@@ -342,10 +342,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -370,10 +367,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -398,10 +392,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -422,10 +413,7 @@ namespace detail
 
 	template <typename T>
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x2<T> & tmat4x2<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp
index bb2f5d8a..8465a837 100644
--- a/glm/core/type_mat4x3.hpp
+++ b/glm/core/type_mat4x3.hpp
@@ -134,19 +134,19 @@ namespace detail
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x3<T> & operator=  (tmat4x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x3<T> & operator+= (U const & s);
+		GLM_FUNC_DECL tmat4x3<T> & operator+= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x3<T> & operator+= (tmat4x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x3<T> & operator-= (U const & s);
+		GLM_FUNC_DECL tmat4x3<T> & operator-= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x3<T> & operator-= (tmat4x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x3<T> & operator*= (U const & s);
+		GLM_FUNC_DECL tmat4x3<T> & operator*= (U s);
 		template <typename U> 
 		GLM_FUNC_DECL tmat4x3<T> & operator*= (tmat4x3<U> const & m);
 		template <typename U> 
-		GLM_FUNC_DECL tmat4x3<T> & operator/= (U const & s);
+		GLM_FUNC_DECL tmat4x3<T> & operator/= (U s);
 
 		GLM_FUNC_DECL tmat4x3<T> & operator++ ();
 		GLM_FUNC_DECL tmat4x3<T> & operator-- ();
diff --git a/glm/core/type_mat4x3.inl b/glm/core/type_mat4x3.inl
index e862b0dd..75307a5f 100644
--- a/glm/core/type_mat4x3.inl
+++ b/glm/core/type_mat4x3.inl
@@ -344,10 +344,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -372,10 +369,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -400,10 +394,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -424,10 +415,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x3<T> & tmat4x3<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;
diff --git a/glm/core/type_mat4x4.hpp b/glm/core/type_mat4x4.hpp
index 07b981e9..85696b9a 100644
--- a/glm/core/type_mat4x4.hpp
+++ b/glm/core/type_mat4x4.hpp
@@ -140,19 +140,19 @@ namespace detail
 		template <typename U>
 		GLM_FUNC_DECL tmat4x4<T> & operator=  (tmat4x4<U> const & m);
 		template <typename U>
-		GLM_FUNC_DECL tmat4x4<T> & operator+= (U const & s);
+		GLM_FUNC_DECL tmat4x4<T> & operator+= (U s);
 		template <typename U>
 		GLM_FUNC_DECL tmat4x4<T> & operator+= (tmat4x4<U> const & m);
 		template <typename U>
-		GLM_FUNC_DECL tmat4x4<T> & operator-= (U const & s);
+		GLM_FUNC_DECL tmat4x4<T> & operator-= (U s);
 		template <typename U>
 		GLM_FUNC_DECL tmat4x4<T> & operator-= (tmat4x4<U> const & m);
 		template <typename U>
-		GLM_FUNC_DECL tmat4x4<T> & operator*= (U const & s);
+		GLM_FUNC_DECL tmat4x4<T> & operator*= (U s);
 		template <typename U>
 		GLM_FUNC_DECL tmat4x4<T> & operator*= (tmat4x4<U> const & m);
 		template <typename U>
-		GLM_FUNC_DECL tmat4x4<T> & operator/= (U const & s);
+		GLM_FUNC_DECL tmat4x4<T> & operator/= (U s);
 		template <typename U>
 		GLM_FUNC_DECL tmat4x4<T> & operator/= (tmat4x4<U> const & m);
 		GLM_FUNC_DECL tmat4x4<T> & operator++ ();
diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl
index 9640acff..29f80d8e 100644
--- a/glm/core/type_mat4x4.inl
+++ b/glm/core/type_mat4x4.inl
@@ -374,10 +374,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x4<T>& tmat4x4<T>::operator+= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x4<T>& tmat4x4<T>::operator+= (U s)
 	{
 		this->value[0] += s;
 		this->value[1] += s;
@@ -402,10 +399,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U> 
-	GLM_FUNC_QUALIFIER tmat4x4<T> & tmat4x4<T>::operator-= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x4<T> & tmat4x4<T>::operator-= (U s)
 	{
 		this->value[0] -= s;
 		this->value[1] -= s;
@@ -430,10 +424,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U>
-	GLM_FUNC_QUALIFIER tmat4x4<T> & tmat4x4<T>::operator*= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x4<T> & tmat4x4<T>::operator*= (U s)
 	{
 		this->value[0] *= s;
 		this->value[1] *= s;
@@ -454,10 +445,7 @@ namespace detail
 
 	template <typename T> 
 	template <typename U>
-	GLM_FUNC_QUALIFIER tmat4x4<T> & tmat4x4<T>::operator/= 
-	(
-		U const & s
-	)
+	GLM_FUNC_QUALIFIER tmat4x4<T> & tmat4x4<T>::operator/= (U s)
 	{
 		this->value[0] /= s;
 		this->value[1] /= s;