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