Merge pull request #2119 from lambdageek/dev/bug-17571