Merge pull request #4592 from lambdageek/bug-53890-2017-02