Auto-Merge pull request #2945 from octo/ff/travis