Bug 1073134 - Be more permissive on OSX 10.9.5 when parental control is on. r=jdm, a=lmandel
Bug 1090450 - Properly check add-on update state during update interval. r=Mossop, a=lmandel

A refactoring in bug 995108 inadvertently disabled background add-on updates by
moving the timer handler to AddonManagerPrivate without fixing the values the
method uses to point to meaningful locations.
Bug 1081926 - Fallback on a simple image lookup when the normal lookup fails. r=mattwoodrow, a=lmandel
Bug 1076910 - Don't use gfxPlatform::GetPlatform() off the main thread. r=Bas, a=sledru
Bug 1076910 - Add some error checks to gfxUtils::EncodeSourceSurface. r=Bas, a=sledru
Bug 1084280 - Use a local RegExpStack when running the RegExp interpreter. r=jandem, a=dveditz
Bug 1088247 - A developer tool should only be enabled when appropriate actors exist. r=jryans, a=lsblakk
Bug 1069055 - Merge focused element deletion test to another test. r=yxl, a=test-only
Bug 717824: make --with-macbundle-prefix dependent on update channel in nightly mozconfigs, r=bhearsum/catlee, a=gavin
Backed out changeset e1aeaf8c1235 (bug 1069055) for mochitest-other permafail.
Bug 1069055 - Merge focused element deletion test to another test. r=yxl, a=test-only
Backed out changeset 16b8d9e3ef7c (bug 1088247) for breaking devtools tests everywhere.
Merge commit '70420ca0cd9f5ce2e0c76730d8c44e2ad379761a' into embedlite_35