Fix a memory leak
Merge branch 'develop'