Merge pull request #2481 from YuriPet/master