Update with 8279c6b from Travis CI