diff --git a/.travis.yml b/.travis.yml
index dd28fa7d..424c5a49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -125,22 +125,6 @@ matrix:
           - ninja-build
           - liblua5.2-dev
 
-    - os: linux
-      env:
-        - LUA_VERSION=luajit51
-        - LLVM_VERSION=3.6.0
-        - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
-        - COMPILER=clang++
-        - CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
-        - CXXFLAGS=-lc++
-        - PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH
-        - LD_LIBRARY_PATH=$HOME/clang-$LLVM_VERSION/lib:$LD_LIBRARY_PATH
-      before_install:
-       - wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
-       - mkdir $HOME/clang-$LLVM_VERSION
-       - tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1
-       - export PATH=$HOME/clang+llvm/bin:$PATH
-       - source ./install.deps.sh
       compiler: clang
       addons:
         apt:
@@ -233,6 +217,23 @@ matrix:
           - ninja-build
           - liblua5.2-dev
 
+    - os: linux
+      env:
+        - LUA_VERSION=luajit51
+        - LLVM_VERSION=4.0.0
+        - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
+        - COMPILER=clang++
+        - CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1"
+        - CXXFLAGS=-lc++
+        - PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH
+        - LD_LIBRARY_PATH=$HOME/clang-$LLVM_VERSION/lib:$LD_LIBRARY_PATH
+      before_install:
+       - wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH
+       - mkdir $HOME/clang-$LLVM_VERSION
+       - tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1
+       - export PATH=$HOME/clang+llvm/bin:$PATH
+       - source ./install.deps.sh
+
     - os: linux
       env:
         - LUA_VERSION=lua52
diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp
index 1bd76c63..68e41999 100644
--- a/single/sol/sol.hpp
+++ b/single/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2017-08-11 22:24:57.365154 UTC
-// This header was generated with sol v2.18.0 (revision 7af8b4e)
+// Generated 2017-08-12 02:25:46.299991 UTC
+// This header was generated with sol v2.18.0 (revision 2486d6a)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -7505,10 +7505,10 @@ namespace sol {
 					if (sizeof(T) < sizeof(lua_Integer) || (std::is_signed<T>::value && sizeof(T) == sizeof(lua_Integer))) {
 						return true;
 					}
-					auto u_min = static_cast<std::intmax_t>(std::numeric_limits<lua_Integer>::min());
-					auto u_max = static_cast<std::uintmax_t>(std::numeric_limits<lua_Integer>::max());
-					auto t_min = static_cast<std::intmax_t>(std::numeric_limits<T>::min());
-					auto t_max = static_cast<std::uintmax_t>(std::numeric_limits<T>::max());
+					auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
+					auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
+					auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
+					auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
 					return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
 				};
 				if (integer_value_fits(value)) {
diff --git a/sol/stack_push.hpp b/sol/stack_push.hpp
index 777c4745..672f76a6 100644
--- a/sol/stack_push.hpp
+++ b/sol/stack_push.hpp
@@ -201,10 +201,10 @@ namespace sol {
 					if (sizeof(T) < sizeof(lua_Integer) || (std::is_signed<T>::value && sizeof(T) == sizeof(lua_Integer))) {
 						return true;
 					}
-					auto u_min = static_cast<std::intmax_t>(std::numeric_limits<lua_Integer>::min());
-					auto u_max = static_cast<std::uintmax_t>(std::numeric_limits<lua_Integer>::max());
-					auto t_min = static_cast<std::intmax_t>(std::numeric_limits<T>::min());
-					auto t_max = static_cast<std::uintmax_t>(std::numeric_limits<T>::max());
+					auto u_min = static_cast<std::intmax_t>((std::numeric_limits<lua_Integer>::min)());
+					auto u_max = static_cast<std::uintmax_t>((std::numeric_limits<lua_Integer>::max)());
+					auto t_min = static_cast<std::intmax_t>((std::numeric_limits<T>::min)());
+					auto t_max = static_cast<std::uintmax_t>((std::numeric_limits<T>::max)());
 					return (u_min <= t_min || value >= static_cast<T>(u_min)) && (u_max >= t_max || value <= static_cast<T>(u_max));
 				};
 				if (integer_value_fits(value)) {