Merge pull request #2227 from YuriPet/master