Merge pull request #585 from google/travis-fix

Fix github issue 584