Update with 70dd68f from Travis CI