Code

Merge branch 'jn/maint-notes-avoid-va-args' into maint