Merged r12138, r12149, r12156 and r12157 from trunk to 2.3-stable (#14931)
scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0.
Authored by: tmaruyama 2013-09-19
Parent: [r12159]
Child: [r12161]