merged in changes from my travis-web until c228ded089d36e690dc3b259571796e87f823edc

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>