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