Merge "Fix mismatched malloc / delete."