Fix Travis builds of master branch