Bug 1039159 - Backport fix to B2G 1.4 (gecko 30). a=1.4+