Merge branch 'as/calloc-takes-nmemb-then-size'