Sync tweak-build-take-two branch with trunk at r1425608.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/tweak-build-take-two@1425612 13f79535-47bb-0310-9956-ffa450edef68