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