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