Merge branch 'jc/parseopt-verify-short-name'