Update with 2387ae6 from Travis CI