Merge "Fix 'potential memory leak' compiler warning." into nyc-dev