Spiritually merge r1428706 from trunk, under the obvious fix rule.
Spiritually merge r1428706 from trunk, under the obvious fix rule.


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

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