Bug 1024300 - Allow GMPs to be segregated by origin. r=josh
Bug 1024405 - Discard enqueued samples when making video decoders dormant. r=kinetik
Merge m-c to m-i
Bug 965967 - Use Moz2D instead of a Thebes backed gfxContext in PluginInstanceChild::PaintRectToSurface. r=mattwoodrow
Bug 1031199 - Disallow aWeight = 0 when calling gfxUserFontSet::AddFontFace. r=jdaggett
Bug 1031205 - Make gfxUserFontSet methods take already-parsed language override values. r=jdaggett
Bug 1028237 - Account for device offset for thebes layer masks. r=roc
Bug 1022852 - Fix setInputMethodActive test that rely on order of async message. r=yxl
Bug 1029956 - Fix mLayerRef init for color layers. r=dglastonbury

We didn't initialize the mLayerRef in the constructor of
DebugGLColorData. Just fix it.
Bug 1031395 - Remove a double assignment to "limit" to fix a minor warning found by scan-build, the LLVM/Clang static analyzer. r=ehsan
Bug 976923 - reftest fails - font-inflation disable-fontinfl-on-mobile-4.html. r=mbrubeck
Bug 1024360 - Remove usage of deprecated mozIStorageBaseStatement methods. r=mak
merge mozilla-inbound to mozilla-central a=merge