fix travis
Merge branch 'master' into pkg-tomcat