Merge pull request #4368 from hmronline/master