Merge pull request #3660 from lambdageek/bug-42271