Merge branch 'ao/path-use-xmalloc'