Bug 864216 - Allow generating IonScriptCounts for asm.js compiled functions, r=luke.
Bug 418615 - Neuter the code which tries to reframe existing plugin instances when navigator.plugins.refresh(true) is called. Instead, only scan for new plugins, unload unused plugins. The DOM code will continue to refresh the current page which calls navigator.plugins.refresh(true). r=jschoenick sr=bz
Bug 854082 - Attribute bug 621618 assertions to the proper test. r=gfritzsche
Bug 854082 - Test. r=bsmedberg
Bug 854082 - Restore SetFrame(null) call to avoid instance owners pointing to dead frames. r=bsmedberg
Bug 854082 - Cleanup plugin frame ownership, prevent losing our frame due to re-entrance. r=bsmedberg
Bug 863792 - Handle re-entry during plugin instantiation. r=josh
Bug 863792 - Test. r=josh
Bug 857324: Make column set reflow continue without balancing rather than restarting if computed height is exceeded. [r=mats]
Bug 781702 - silence warning spew from nsXBLProtoImplMethod.cpp; r=bz
Bug 865260 - Use IsXrayWrapper rather than ObjectIsNativeWrapper in nsWindowSH. r=bz

There are some other uses of ObjectIsNativeWrapper in other scriptable helpers
that are tempting to remove as well, but it's probably just better to wait for
that stuff to just go away. Given that the issue we're running into here is
Window-specific, there's not a pressing need to fix the other stuff.
Bug 863922 - Use the device pixel size of plugin IOSurfaces since layers handles resolution scaling already. r=BenWa
Bug 865147 - Fix crash in nsContentUtils::ContentIsDescendantOf by checking parent of 'before' node, r=bz, feedback=Ms2ger
bug 865314 dont restrict parallel ssl handshakes with unknown spdy state r=jduell
Bug 857700 - Fix race condition in AsmJSMachExceptionHandler (r=vlad)

--HG--
extra : rebase_source : bba872fdedfc119468ad586eca97b00881a5dee9
Bug 863319 - Improve assertions in browser_image mochitest. r=joe

--HG--
extra : rebase_source : bf323152a21613bf20d1ff2456520346bf1460b1
Bug 858582 - Prevent callsite cloning of callsite clones. (r=bhackett)
Bug 861904. (r=sstangl)
Merge m-c to inbound.
Bug 865004 - Disconnect the AudioNode from the graph before deleting it; r=bzbarsky