Merge pull request #4769 from lambdageek/bug-55681-2017-02