Update from Travis CI (actually by hand)