On the '1.7.x-issue4332' branch, merge from trunk r1452967, which added a regression test for this issue.
On the '1.7.x-issue4332' branch, merge from trunk r1452967, which
added a regression test for this issue.


git-svn-id: 057c32ff19474a7fe91f7086dee1d2fad2a8905e@1453489 13f79535-47bb-0310-9956-ffa450edef68

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