Auto-merged master into remove-sponsors on deployment.
Auto-merged master into remove-sponsors on deployment.

travis-ci/travis-web,fotinakis/travis-web,travis-ci/travis-web,fotinakis/travis-web,fotinakis/travis-web,fotinakis/travis-web,travis-ci/travis-web,travis-ci/travis-web