Merge fix branch for PR60947.
authorJacob Champion <jchampion@apache.org>
Wed, 19 Apr 2017 02:42:43 +0000 (02:42 +0000)
committerJacob Champion <jchampion@apache.org>
Wed, 19 Apr 2017 02:42:43 +0000 (02:42 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791849 13f79535-47bb-0310-9956-ffa450edef68


Trivial merge