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