Merge pull request #5275 from lambdageek/bug-58361-2017-06