Merged r12367 and r12368 from trunk to 2.4-stable
Authored by: marutosijp 2013-12-07
Parent: [r12368]
Child: [r12370]