Merge Branch "travis" into "master"

As soon as `travis-ci.org` has been integrated properly, the associated branch should get merged.