Merge pull request #2517 from YuriPet/master