Merge pull request #1925 from YuriPet/master