Apply patch to release branch; Fixes #8032

svn path=; revision=84450