On the 1.7.x-issue4169 backport branch: Merge r1330520 from trunk.
On the 1.7.x-issue4169 backport branch: Merge r1330520 from trunk.


git-svn-id: c228d1661dce92199bf7ead6cd2291269c8aefaf@1330544 13f79535-47bb-0310-9956-ffa450edef68

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