Merge pull request #3733 from lambdageek/c9-bug-42271