Fix a memory leak.
Merge