Merge branch 'ib/rev-parse-parseopt-argh'