On the svnraisetc branch:

Merge changes from trunk up to r37633.


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