bring in some changes from travis-web

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
[ci skip]