Merge branch 'cb/curl-use-xmalloc'