Merge pull request #3166 from YuriPet/patch-1