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