Merge branch 'js/reflog'