Merge "Fix potental memory leak (compiler warning)."