Bug 1037666. r=billm, a=abillings
Merge mozilla-beta to b2g32. a=merge