On the merge-tracking-1 branch: catch up to trunk@1489600.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/move-tracking-1@1489602 13f79535-47bb-0310-9956-ffa450edef68