Merge pull request #4501 from AndroKev/master