Merge pull request #4490 from Tailszefox/master