Merge branch 'nd/grep-reflog'