Merge pull request #5210 from ftokarev/patches