Merge pull request #2935 from YuriPet/patch-1