Merge pull request #3117 from YuriPet/patch-5