diff --git a/doc/glm.docx b/doc/glm.docx
index 8d3350c5..1da42593 100644
Binary files a/doc/glm.docx and b/doc/glm.docx differ
diff --git a/doc/glm.pdf b/doc/glm.pdf
index 4ed3568f..79c34270 100644
Binary files a/doc/glm.pdf and b/doc/glm.pdf differ
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 1d1e18d3..6ca11a62 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -3,6 +3,10 @@
 
 #pragma once
 
+#if defined(GLM_FORCE_SWIZZLE) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
+#	error "Both GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE can't be defined at the same time"
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////////
 // Messages