On the 1.7.x-r1173425 branch: Merge r1174797 from ^/subversion/trunk.
On the 1.7.x-r1173425 branch: Merge r1174797 from ^/subversion/trunk.


git-svn-id: 5e329499e8c5fbdec4558e90886e790e20619f92@1174804 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion