Merge branch 'js/parseopt-abbrev-fix'