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