Merge pull request #3070 from rubenk/travis-improvements