B2g34 v2 1

Sync with Mozilla v2.1 branch