Merged changeset 86412 from trunk.
Fixes #9286



[SVN r86424]