fix travis
Merge branch 'master' into pkg-tomcat
Merge remote-tracking branch 'origin/master' into bootstrap