Merge pull request #2298 from YuriPet/master