Merge r1820750 from trunk#533

covener wants to merge 2 commits intoapache:2.4.xapache/httpd:2.4.xfrom

covener:1820750covener/httpd:1820750Copy head branch name to clipboard