Merge "Fix a double-free"