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