On the 1.7.x-issue4153 branch, merge r1338748 from trunk (clean merge).
On the 1.7.x-issue4153 branch, merge r1338748 from trunk (clean merge).


git-svn-id: e32686acb4486796c07a6118ce834f6595588829@1338755 13f79535-47bb-0310-9956-ffa450edef68

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