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