Merged r9949 from trunk to 1.4-stable
Tests should not change settings.
Authored by: tmaruyama 2012-09-01
Parent: [r10249]
Child: [r10251]