Prepped for the Tomcat 8 bump