Merge pull request #4045 from lambdageek/bug-47867