Merge branch 'nd/diff-parseopt-2'