merged changes from travis-web upto e343161

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