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