Merge "Fix a STLport-related crash."