On the 'pristines-on-demand' branch: sync with trunk@1897694.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/pristines-on-demand@1897695 13f79535-47bb-0310-9956-ffa450edef68