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