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