merge with tomcat-branch