Merge r1536021 from trunk:

this was backported to 2.2, so not an upgrade issue.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1536022 13f79535-47bb-0310-9956-ffa450edef68