Merge branch 'jk/grep-double-dash' into maint