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