Merge pull request #4723 from lambdageek/bug-54485