diff --git a/.travis.yml b/.travis.yml
index bc8573603..94f4fb6be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: cpp
 matrix:
   include:
     - os: osx
-      osx_image: xcode9
       env:
         - ENABLE_UI=ON
         - MATRIX_EVAL="wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip && unzip ninja-mac.zip && export PATH=$PWD:$PATH"
diff --git a/laf b/laf
index 2988e8cbc..2298ff402 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 2988e8cbce99ce37009ab7729c167ae9be5f58c1
+Subproject commit 2298ff4029e8aec9fc94d26f401c9646d2a94e98