Bug 842221 - Fix the reference to the settings object
Merge pull request #8202 from crh0716/v1-train_840322

Bug 842221 - Fix the reference to the settings object, r=timdream, a=vivien