Update with 317439f from Travis CI