Merge "Clean up after "Kill mbstring fallbacks""