Merge pull request #1972 from YuriPet/master