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