Merge branch 'master' of github.com:travis-ci/travis-images
Merge branch 'master' of github.com:travis-ci/travis-images