Merge change Icb64cd2c into eclair-mr2

* changes:
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.