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