am 266099b1: Merge "Fix mismatched malloc / delete."
am 266099b1: Merge "Fix mismatched malloc / delete."

* commit '266099b1e188ca6742cf4b0868370112c40ce22d':
  Fix mismatched malloc / delete.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst