Merge branch 'staging'
Update travis-build

This includes PR https://github.com/travis-ci/travis-build/pull/265
and fixes https://github.com/travis-ci/travis-ci/issues/2524
Update travis-build
update travis-build