On the 1.7.x-r1389928 branch, merge r1389928, resolving conflicts.
On the 1.7.x-r1389928 branch, merge r1389928, resolving conflicts.


git-svn-id: b1f2f679b48ee00b1e1de4a448d77572260d66b2@1390387 13f79535-47bb-0310-9956-ffa450edef68

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