Merge pull request #3095 from YuriPet/patch-3