Merged r11706 and r11707 from trunk to 2.3-stable (#13644)
fix diff error in case of line_left out of range.
Authored by: tmaruyama 2013-04-05
Parent: [r11708]
Child: [r11710]