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