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