Merge branch 'zalloc'