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