Merge wchar_t support changes.