Bug 960458 - cl.py doesn't properly parse showIncludes prefix on some localized versions. r=glandium
Backed out changeset 17220466f40b (bug 960458) for bustages on windows on a CLOSED TREE
Bug 957088 - Use && rather than and in #if directives r=terrence
Bug 961095 - Allow for the fact that the nsJSObjWrapper may be dead when postbarrier callback runs r=terrence
Bug 961095 - Improve generic callbacks with better typing, and by only adding storebuffer entries when the key is in the nursery r=terrence
Bug 961734 - reorder nsFont fields for slightly better packing; r=jfkthame
Bug 959999 Clean up nsTextStore::Initialize() r=jimm
Merge mozilla-central to mozilla-inbound
Bug 961761 - move to static_assert for JSJitInfo; r=efaust
Bug 924972 - Enforce the focus before running every subtest of test_reftests_with_caret.html
Bug 961054 - Don't invoke SetLastResult until the completion of an XPCWN method call. r=mrbkap
Bug 958324 - Remove same-compartment security wrappers for WNs. r=peterv,r=mrbkap

We've fixed Components, and SOWs are new-binding only. Youpie!
Bug 958324 - Remove SOW-transplant-related fixup. r=peterv

This became obsolete with bug 922009.
Backed out changeset 746018b05d67 (bug 924972) because of test failures
Bug 907196 - Split CreateCMSOutputProfile profile loading into GetCMSOutputProfileData. r=BenWa, r=jmuizelaar
Merge mozilla-central to mozilla-inbound including australis

--HG--
extra : amend_source : ea6e6ce90b225ac5058e9ba3a907628feb96c8a0
Bug 826114 - Support Filter Effects specification feColorMatrix saturate type range. r=mstange
Bug 961408 - Ensure all the APZC_LOG statements in APZC print the relevant instance. r=botond
Bug 957560 - Clear the newly allocated d3d TextureClient if the allocation flags says so. r=nrc
Bug 960840 - Don't disable avx2 when updating libvpx. r=cpearce DONTBUILD

Jan reminded me we reset this in update.py, so we need to remove
the lines here as well as enabling avx2 in the linux builds as
we did in bug 946639.