Merge branch 'jk/rev-parse-double-dashes' into maint