Merge branch 'bg/xcalloc-nmemb-then-size' into maint