Merge pull request #1032 from poolifier/combine-prs-branch