Merge pull request #3055 from dfandrich/travis