Merging in version bump NO BUG CLOSED TREE
Merging in branding changes NO BUG CLOSED TREE ba=release
Disable profiling on Aurora NO BUG CLOSED TREE ba=release
Remove dtrace & instruments in mozconfigs on Aurora as per bug 748669 CLOSED TREE ba=release
Merging in l10n changes NO BUG CLOSED TREE IGNORE BROKEN CHANGESETS ba=release
Bug 883928 - Keep the old storagemanager ContractID for backward compatibility. r=ehsan, a=akeybl
Disabling metro in Aurora builds bug 856823 a=release
Bug 886656 - Disable GTest on windows for linking errors. r=philor a=test-only
Bug 886690 - Make sure that the test case for bug 880202 will pass if Web Audio is disabled a=test-only

--HG--
extra : transplant_source : %3C%CB%D6%D85N%1E%D9%E9%87%CD%11%13%AB%D8%3F%C9%96%13%C2
Bug 884566: Don't show default activity until some activity is choosen for first time in QuickShare. [r=mfinkle] [a=bbajaj]
Bug 886660 - Fix the leak in FFTBlock::SetFFTSize(); r=roc a=webaudio-only

--HG--
extra : transplant_source : %DAj%FC%D4%27%1B%AB%B8%CE5%5E%C0%15%D8%E31s%D1%82%BE
Bug 886916 - Regression: Multiple-level settings screens do not handle "back" correctly. r=margaret, a=lsblakk
Bug 885660 - Fix Ion bailouts to overwrite arguments on the stack at the end of the bailout. r=djvj, a=lsblakk
Bug 885976 - Make ScriptFrameIter::numFrameSlots() a bit more robust. r=luke, a=bajaj
Bug 883973 - Disable heavyweight function inlining. r=dvander, a=bajaj
Bug 885298 - Warning: redundant cast to android.os.IInterface in ISelfBrailleService.java. r=kats, a=bajaj
Bug 884989 - OdinMonkey: Check argument types before enabling ffi fastpath to IM. r=luke, a=bajaj
Bug 886266 - Fix issues with enabling/disabling non-active activations. r=jandem, a=bajaj
Bug 885751 - dbg-server.jsm compartment is leaking 500,000-char JavaScript warning strings like a sieve. r=dcamp, a=bajaj
Bug 845147. Fix accidentally landed incorrect patch so it does some sync decoding for images being decoded the first time. r=joe a=bbajaj