Merge branch 'jk/parseopt-usage-msg-opt' into maint