Merge pull request #4886 from hvr/pr/issue-4737