Merge pull request #5277 from lambdageek/bug-58421-2017-06

No match.