Merge pull request #2325 from YuriPet/master