Merge pull request #4907 from stargieg/master