Merge neko wstring patch