Merge branch 'rs/use-isxdigit' into maint