bug 941940 - don't render stray <CR> characters (&#13; entities) in the DOM as hexboxes, just leave them invisible. r=roc
bug 941940 - reftest to check that &#13; characters in the DOM remain invisible. r=roc
bug 941940 followup - restore reftest manifest entry accidentally lost during rebase. no-r=me.
Bug 939942 - Reflow when bounds changes due to stroke creation/removal. r=jwatt
Bug 913648 - SpiderMonkey: Allow allocation of an AssemblerBuffer larger than INT_MAX/2. r=luke
Bug 931864 - remove the activeGCInAtomsZone limitation in JS::CanCompileOffThread (r=billm)

--HG--
extra : rebase_source : 24cc636ef05661f9bbdc17b65609749ff14caab8
Merge m-c to m-i
Bug 852648 - Part 1: Exclude the widget/cocoa files which force NSPR logging from unified builds; r=cpeterson
Bug 934062 - Move call to waitForExplicitFinish to avoid race condition r=sstamm
Bug 886164 - Enforce CSP in sandboxed iframe, r=grobinson
Bug 941404 - Data documents should not set CSP, r=bz
Bug 941617 - IonMonkey: Fix ComputeThis's OSI point, allowing safepoint processing to be refined. r=bhackett
Bug 939820 - IonMonkey: Move LLabel's Label into LBlock. r=bhackett
Bug 939820 - IonMonkey: Don't create LLabels for register allocators other than LSRA. r=bhackett
Bug 939820 - IonMonkey: Don't create LNops for register allocators other than LSRA. r=bhackett
Bug 939824 - IonMonkey: Refactor a splitting method out of splitAcrossCalls. r=bhackett
Bug 939824 - IonMonkey: When splitting across calls, don't split around every range boundary. r=bhackett
Bug 939824 - IonMonkey: Convert trySplitAcrossHotcode to use splitAt. r=bhackett
Bug 941652 - IonMonkey: Fix quadradic-time insertion into LiveInterval use lists. r=bhackett
Bug 941916 followup: Drop another unused param "aFlexContainerFrame" from SingleLineCrossAxisPositionTracker constructor. r=trivial (essentially the same as previous patch)