On the 1.7.x-issue4161 branch, merge r1330258 from trunk, resolving conflicts.
On the 1.7.x-issue4161 branch, merge r1330258 from trunk, resolving conflicts.


git-svn-id: 5d949c9fb719dc59461ac59018461bf12d137880@1330701 13f79535-47bb-0310-9956-ffa450edef68

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