Fixes #8595

svn path=; revision=84390