Merge pull request #4471 from lynxis/travis