Spiritually merge r1428706 from trunk, under the obvious fix rule.


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