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