Merge pull request #4139 from lambdageek/bug-49686