Merge r1643482 from trunk.  Approved as part of normal release activity.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1643483 13f79535-47bb-0310-9956-ffa450edef68