Merge branch 'ss/nedmalloc-compilation'