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