Combined pull request with fixed Travis