Merged r11544, r11545, r11546, r11547, r11549 from trunk to 2.3-stable (#12641)
fix that diff outputs become ??? in some non ASCII words.
Contributed by Filou Centrinov.
Authored by: tmaruyama 2013-03-07
Parent: [r11550]
Child: [r11552]