Fixes #4782 refs: a89bcf837b f46d721630, 27d99765bb This was SVN commit r22884.
a89bcf837b
f46d721630
27d99765bb