Merge branch 'nd/parseopt-completion'