[ddevault]

I cherry pick (or rebase, usually) to master, too. I only merge when I'm actually merging divergent histories.