Merged r12424 from trunk to 2.4-stable.
fix svn raw diff failure on svn version 1.6.17 (revision 1128011).
Authored by: marutosijp 2013-12-20
Parent: [r12424]
Child: [r12426]