Merge "Fix tiny memory leak"