Fixes #8480. Thanks for the patch!

svn path=; revision=84715