Merge pull request #2268 from poolifier/combined-prs-branch