Merge pull request #1196 from rubenk/travis