Merge branch 'mh/reflog-expire'