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