Merge pull request #3446 from lambdageek/bug-42584