Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint