Backport r1213711 to the 1.7.x-r1213711 branch.
Backport r1213711 to the 1.7.x-r1213711 branch.

git-svn-id: 8ca5db9790d657da7b8932db31f128e1f111d835@1213719 13f79535-47bb-0310-9956-ffa450edef68

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