On the 1.7.x branch: Merge r1186815 (obvious fix).
On the 1.7.x branch: Merge r1186815 (obvious fix).


git-svn-id: f31f7a5323bbe4a1034a732b81b9abb714edbfbf@1186859 13f79535-47bb-0310-9956-ffa450edef68

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