svn:eol-style=native
It is a merge of r1596081 from tomcat/trunk.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1596084 13f79535-47bb-0310-9956-ffa450edef68