Merge branch 'maint' * maint: parse-options: clarify PARSE_OPT_NOARG description t3302 (notes): Port to Solaris