On the '1.7.x-r1375052' branch:  merge r1375052 from trunk.
On the '1.7.x-r1375052' branch:  merge r1375052 from trunk.

git-svn-id: f059349bbe27777df57d1482c42cf2eee13ed4ea@1376644 13f79535-47bb-0310-9956-ffa450edef68

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