Merge branch 'jk/maint-snprintf-va-copy' into maint