astearns: when you're merging PRs, can you use the rebase option? Should be available as a drop-down on the Merge button.

astearns: makes it easier to understand the version history that way

Ah, sorry for not paying attention to that today