Bug 1040868 - Move 'default browser'stuff back to the General preferences pane. r=jaws.
Bug 1030735 - Enable devtools/styleinspector test with e10s. r=jwalker
Bug 1054732 - MarkupView tests: Use head.js once method instead of calling inspector.walker.once. Walker uses SDK-events that, unlike EventEmitter, require listener and do not support promises. r=pbrosset
Merge mozilla-central and fx-team
Bug 1026263 - set orientation default pref on firstrun; r=wesj
Bug 1035999 - use JNI to determine if in webapp process for automatic update check; r=wesj
Bug 960671 - Part 2: Add RDP requests for recording allocations. r=past
Backed out changeset 085acacbd031 (bug 960671) for mochitest-other crashes.
Merge fx-team to m-c. a=merge