Merge branch 'jc/am-parseopt-fix'