Tomcat 7.0.56
Merge branch 'TOMCAT' - Tomcat 7.0.56