Updated the var name
Merge remote-tracking branch 'mozilla/v2.0' into v2.0