Merge pull request #5210 from commodo/travis_branch_build