Merge proposals

Jgoguen+mozillabugs has no merge proposals.