Merge branch 'nd/parseopt-completion-more'