Update with a2ef273 from Travis CI