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