Merge branch 'bc/rev-parse-parseopt-fix'