Merge branch 'jc/reflog' into lj/refs