Bug 1041635 - Merged from b2g-4.3_r2.1
Merge pull request #60 from dhylands/b2g-4.4.2_r1

Bug 1041635 - Merged from b2g-4.3_r2.1. r=dhylands