Merge "Fix error's produced by astmm.h when standard allocators are used."