Bug 933219. r=gwagner, a=1.1.x+
Merge b2g18 to v1.1hd. a=merge