Bug 982957 - Fix crash if ConstraintTypeSet::sweep or TypeObject::sweep OOMs. r=bhackett, a=lsblakk
Bug 982906 - No free lunches! r=bzbarsky, a=lsblakk
Merge beta to m-r. a=merge