Merge r1620932 from trunk:

Make up-to-date

Reviewed/backported by: jim


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