On the pin-externals branch, merge outstanding changes from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/pin-externals@1659374 13f79535-47bb-0310-9956-ffa450edef68