Merged r12387 from trunk to 2.4-stable.
fix disable to run test environment.
Authored by: marutosijp 2013-12-09
Parent: [r12387]
Child: [r12389]