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