Merge pull request #3389 from lambdageek/bug-43099