Merge branch '0.9.3' into 0.9.4

glm/gtc/matrix_transform.inl

@@ -422,11 +422,9 @@ namespace glm
 		Result[0][2] =-f.x;
 		Result[1][2] =-f.y;
 		Result[2][2] =-f.z;
-	/*  Test this instead of translate3D
 		Result[3][0] =-dot(s, eye);
-		Result[3][1] =-dot(y, eye);
+		Result[3][1] =-dot(u, eye);
 		Result[3][2] = dot(f, eye);
-	*/  
+		return Result;
-		return translate(Result, -eye);
 	}
 }//namespace glm

glm/gtc/ulp.inl

@@ -188,7 +188,7 @@ namespace detail
 
 #pragma warning(pop)
 
-#if(GLM_COMPILER & GLM_COMPILER_VC)
+#if(GLM_COMPILER & GLM_COMPILER_VC || GLM_COMPILER & GLM_COMPILER_INTEL)
 #	define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))
 #   define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward))
 #else