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