Patch By: LangBart Comments By: Freagarach Differential Revision: D4290 fixes #6341 This was SVN commit r25964.