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