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