Merge branch 'master' into travis-windows

diff --cc .travis.yml
index 8b89afdd8cac5bc1ca6a80775c9c113df4e8cd2d,07dc18b060dbf82d137ab15c67a4eadc103c8faf..4d0f05264fbd0b8d9202688f2bd46320ed3ac0f9
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -37,7 -23,7 +37,7 @@@ before_install
    - git init
    - git remote add origin https://github.com/haskell/haskell-ide-engine.git
    - git pull origin master
-   - git checkout ed512e250b8699d212417191064e5fbbc0ecdac8
 -  - git checkout 890ca3f2f3bd3bfe74e1f38a426b383a847763bb
++  - git checkout 1a5640f4790bde364dcd0a61617c5ca5b85b145a
    - git submodule init
    - git submodule sync
    - git submodule update --init