Apply patch to release branch; Fixes #8391

svn path=; revision=84755