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
Merge branch 'master' into bluebox-production-com
Update travis-build
Merge branch 'master' into bluebox-production-com