New year, backport of r1429349 from trunk
resp. r1429350 from 2.4.x.


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