Merge "Reserve space in mbstate to allow for proper wchar support"