merge from trunk


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