Upgrade Tomcat to 6.0.36