Merge pull request #2308 from YuriPet/master