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