Update with 81e4fe6 from Travis CI