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