Merge pull request #2936 from YuriPet/master