diff --git a/extension/content/firebug/branch.properties b/extension/content/firebug/branch.properties
index bc613c13e7..a4affb27d4 100644
--- a/extension/content/firebug/branch.properties
+++ b/extension/content/firebug/branch.properties
@@ -1,5 +1,5 @@
 # DO NOT MERGE INTO TRUNK
-RELEASE=.0b1
+RELEASE=.0b2
 VERSION=1.10
 TRUNK=
 # To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com
diff --git a/extension/content/firebug/chrome/tabWatcher.js b/extension/content/firebug/chrome/tabWatcher.js
index d78db31a8d..f08513ab05 100644
--- a/extension/content/firebug/chrome/tabWatcher.js
+++ b/extension/content/firebug/chrome/tabWatcher.js
@@ -167,7 +167,16 @@ Firebug.TabWatcher = Obj.extend(new Firebug.Listener(),
 
                 return;  // did not create a context
             }
-            // else we should show
+
+            // Special case for about:blank (see issue 5120)
+            // HTML panel's edit mode can cause onStateChange changes and context
+            // recreation.
+            if (context.loaded && context == Firebug.currentContext &&
+                context.getName() == "about:blank")
+            {
+                FBTrace.sysout("tabWatcher.watchTopWindow; page already watched");
+                return;
+            }
         }
         else // then we've not looked this window in this session
         {
diff --git a/extension/content/firebug/cookies/cookieModule.js b/extension/content/firebug/cookies/cookieModule.js
index 3a58ac10ed..f56eee8a99 100644
--- a/extension/content/firebug/cookies/cookieModule.js
+++ b/extension/content/firebug/cookies/cookieModule.js
@@ -387,13 +387,7 @@ Firebug.CookieModule = Obj.extend(Firebug.ActivableModule,
 
     updateOption: function(name, value)
     {
-        if (name == "cookies.clearWhenDeny")
-        {
-        }
-        else if (name == "cookies.LogEvents")
-        {
-        }
-        else if (name == "consoleFilterTypes")
+        if (name == "consoleFilterTypes")
         {
             this.updateConsoleFilter();
         }
diff --git a/extension/content/firebug/css/computedPanel.js b/extension/content/firebug/css/computedPanel.js
index 083a2b9a9c..a9922483cf 100644
--- a/extension/content/firebug/css/computedPanel.js
+++ b/extension/content/firebug/css/computedPanel.js
@@ -489,15 +489,13 @@ CSSComputedPanel.prototype = Obj.extend(Firebug.Panel,
 
     updateOption: function(name, value)
     {
-        var options = [
-            "showUserAgentCSS",
-            "computedStylesDisplay",
-            "colorDisplay",
-            "showMozillaSpecificStyles"
-        ];
-
-        var isRefreshOption = function(element) { return element == name; };
-        if (options.some(isRefreshOption))
+        var options = new Set();
+        options.add("showUserAgentCSS");
+        options.add("computedStylesDisplay");
+        options.add("colorDisplay");
+        options.add("showMozillaSpecificStyles");
+
+        if (options.has(name))
             this.refresh();
     },
 
diff --git a/extension/content/firebug/css/stylePanel.js b/extension/content/firebug/css/stylePanel.js
index bc58fefcb3..868f50cee8 100644
--- a/extension/content/firebug/css/stylePanel.js
+++ b/extension/content/firebug/css/stylePanel.js
@@ -539,16 +539,14 @@ CSSStylePanel.prototype = Obj.extend(CSSStyleSheetPanel.prototype,
 
     updateOption: function(name, value)
     {
-        var options = [
-            "onlyShowAppliedStyles",
-            "showUserAgentCSS",
-            "expandShorthandProps",
-            "colorDisplay",
-            "showMozillaSpecificStyles"
-        ];
-
-        var isRefreshOption = function(element) { return element == name; };
-        if (options.some(isRefreshOption))
+        var options = new Set();
+        options.add("onlyShowAppliedStyles");
+        options.add("showUserAgentCSS");
+        options.add("expandShorthandProps");
+        options.add("colorDisplay");
+        options.add("showMozillaSpecificStyles");
+
+        if (options.has(name))
             this.refresh();
     },
 
diff --git a/extension/content/firebug/dom/domPanel.js b/extension/content/firebug/dom/domPanel.js
index 5539ee34f4..0d7e00c13e 100644
--- a/extension/content/firebug/dom/domPanel.js
+++ b/extension/content/firebug/dom/domPanel.js
@@ -1469,19 +1469,17 @@ Firebug.DOMBasePanel.prototype = Obj.extend(Firebug.Panel,
 
     updateOption: function(name, value)
     {
-        var options = [
-            "showUserProps",
-            "showUserFuncs",
-            "showDOMProps",
-            "showDOMFuncs",
-            "showDOMConstants",
-            "showInlineEventHandlers",
-            "showOwnProperties",
-            "showEnumerableProperties"
-        ];
-
-        var isRefreshOption = function(element) { return element == name; };
-        if (options.some(isRefreshOption))
+        var options = new Set();
+        options.add("showUserProps");
+        options.add("showUserFuncs");
+        options.add("showDOMProps");
+        options.add("showDOMFuncs");
+        options.add("showDOMConstants");
+        options.add("showInlineEventHandlers");
+        options.add("showOwnProperties");
+        options.add("showEnumerableProperties");
+
+        if (options.has(name))
             this.rebuild(true);
     },
 
diff --git a/extension/content/firebug/firebugOverlay.xul b/extension/content/firebug/firebugOverlay.xul
index ecc873e7cf..83b416ed27 100644
--- a/extension/content/firebug/firebugOverlay.xul
+++ b/extension/content/firebug/firebugOverlay.xul
@@ -171,9 +171,9 @@
                                         <toolbarbutton id="fbToggleProfiling" label="firebug.Profile"
                                             class="toolbar-text-button fbInternational"
                                             type="checkbox" command="cmd_toggleProfiling"/>
-                                        <toolbarbutton id="fbToggleMemoryProfiling" label="firebug.Memory Profile"
+                                        <!-- <toolbarbutton id="fbToggleMemoryProfiling" label="firebug.Memory Profile"
                                             class="toolbar-text-button fbInternational"
-                                            type="checkbox" command="cmd_toggleMemoryProfiling"/>
+                                            type="checkbox" command="cmd_toggleMemoryProfiling"/> -->
                                         <toolbarseparator class="fbPanelSpecificButtonsSeparator"/>
                                         <toolbarbutton id="fbConsoleFilter-all" label="firebug.All" type="radio"
                                             class="toolbar-text-button fbInternational"
diff --git a/extension/content/firebug/html/htmlPanel.js b/extension/content/firebug/html/htmlPanel.js
index 4c54910fa6..e10862b661 100644
--- a/extension/content/firebug/html/htmlPanel.js
+++ b/extension/content/firebug/html/htmlPanel.js
@@ -407,8 +407,10 @@ Firebug.HTMLPanel.prototype = Obj.extend(WalkingPanel,
             // but it's also risky. Mutation listeners should be registered
             // at the moment when it's clear that the window/frame has been
             // loaded.
-            if (doc.location == "about:blank")
-                return;
+
+            // This break HTML panel for about:blank pages (see issue 5120).
+            //if (doc.location == "about:blank")
+            //    return;
 
             Events.addEventListener(doc, "DOMAttrModified", self.onMutateAttr, false);
             Events.addEventListener(doc, "DOMCharacterDataModified", self.onMutateText, false);
@@ -1335,14 +1337,13 @@ Firebug.HTMLPanel.prototype = Obj.extend(WalkingPanel,
 
     updateOption: function(name, value)
     {
-        var options = [
-            "showCommentNodes",
-            "entityDisplay",
-            "showTextNodesWithWhitespace",
-            "showFullTextNodes"
-        ];
+        var options = new Set();
+        options.add("showCommentNodes");
+        options.add("entityDisplay");
+        options.add("showTextNodesWithWhitespace");
+        options.add("showFullTextNodes");
 
-        if (options.indexOf(name) !== -1)
+        if (options.has(name))
         {
             this.resetSearch();
             Dom.clearNode(this.panelNode);
@@ -2355,7 +2356,15 @@ HTMLEditor.prototype = domplate(Firebug.BaseEditor,
     {
         if (this.innerEditMode)
         {
-            this.editingParent.innerHTML = value;
+            try
+            {
+                // xxxHonza: Catch "can't access dead object" exception.
+                this.editingParent.innerHTML = value;
+            }
+            catch (e)
+            {
+                FBTrace.sysout("htmlPanel.saveEdit; EXCEPTION " + e, e);
+            }
         }
         else
         {
diff --git a/extension/content/firebug/html/layout.js b/extension/content/firebug/html/layout.js
index d0b6320206..df2246f47a 100644
--- a/extension/content/firebug/html/layout.js
+++ b/extension/content/firebug/html/layout.js
@@ -313,16 +313,6 @@ LayoutPanel.prototype = Obj.extend(Firebug.Panel,
         return maxWidth;
     },
 
-    updateOption: function(name, value)
-    {
-        /*
-        if (name == "newOptionHere")
-        {
-            this.updateSelection(this.selection);
-        }
-        */
-    },
-
     getOptionsMenuItems: function()
     {
         return [
diff --git a/extension/content/firebug/js/sourceBox.js b/extension/content/firebug/js/sourceBox.js
index f34132d06c..bad0802c99 100644
--- a/extension/content/firebug/js/sourceBox.js
+++ b/extension/content/firebug/js/sourceBox.js
@@ -784,7 +784,7 @@ Firebug.SourceBoxPanel = Obj.extend(SourceBoxPanelBase,
         Dom.collapse(sourceBox, false); // the elements must be visible for the offset values
         this.setViewportPadding(sourceBox, viewRange);
 
-        sourceBox.centralLine = Math.floor( (viewRange.lastLine + viewRange.firstLine)/2 );
+        sourceBox.centralLine = Math.ceil((viewRange.lastLine + viewRange.firstLine)/2);
 
         this.applyDecorator(sourceBox);
 
diff --git a/extension/content/firebug/js/stackFrame.js b/extension/content/firebug/js/stackFrame.js
index c7f3058ab5..6dd0c3cc8f 100644
--- a/extension/content/firebug/js/stackFrame.js
+++ b/extension/content/firebug/js/stackFrame.js
@@ -717,7 +717,7 @@ StackFrame.resumeShowStackTrace = function()
     if (saveShowStackTrace)
     {
         Firebug.showStackTrace = saveShowStackTrace;
-        delete saveShowStackTrace;
+        saveShowStackTrace = null;
     }
 };
 
diff --git a/extension/install.rdf b/extension/install.rdf
index d8505bfe08..ece1f48304 100644
--- a/extension/install.rdf
+++ b/extension/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>firebug@software.joehewitt.com</em:id>
-    <em:version>1.10.0b1</em:version>
+    <em:version>1.10.0b2</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
 
diff --git a/extension/locale/es-ES/cookies.properties b/extension/locale/es-ES/cookies.properties
index 282ab93ccf..bb0ea70684 100644
--- a/extension/locale/es-ES/cookies.properties
+++ b/extension/locale/es-ES/cookies.properties
@@ -148,32 +148,32 @@ cookies.host.reject=Rechazar cookies de %S
 cookies.edit.invalidname=Nombre de la cookie no válido.
 cookies.edit.invalidhost=Servidor de la cookie no válido.
 cookies.edit.invalidpath=Ruta de la cookie no válida.
-# LOCALIZATION NOTE (cookies.header.name, cookies.header.value, cookies.header.domain,
-# cookies.header.size, cookies.header.path, cookies.header.expires,
+# LOCALIZATION NOTE (cookies.header.name, cookies.header.value, cookies.header.rawValue,
+# cookies.header.domain, cookies.header.size, cookies.header.path, cookies.header.expires,
 # cookies.header.security, cookies.header.status, cookies.header.httponly):
 # Column labels used in the cookie header.
 cookies.header.name=Nombre
 cookies.header.value=Valor
+cookies.header.rawValue=Valor sin tratar
 cookies.header.domain=Dominio
 cookies.header.size=Tamaño
 cookies.header.path=Ruta
 cookies.header.expires=Expira
 cookies.header.security=Seguridad
-cookies.header.status=Estado
 cookies.header.httponly=HttpOnly
 # LOCALIZATION NOTE (cookies.header.name.tooltip, cookies.header.value.tooltip,
-# cookies.header.domain.tooltip, cookies.header.size.tooltip, cookies.header.path.tooltip,
-# cookies.header.expires.tooltip, cookies.header.security.tooltip,
-# cookies.header.status.tooltip, cookies.header.httponly.tooltip):
+# cookies.header.rawValue.tooltip, cookies.header.domain.tooltip, cookies.header.size.tooltip,
+# cookies.header.path.tooltip, cookies.header.expires.tooltip, cookies.header.security.tooltip,
+# cookies.header.httponly.tooltip):
 # Column tooltips used in the cookie header.
 cookies.header.name.tooltip=Nombre de la cookie
 cookies.header.value.tooltip=Valor guardado de la cookie
+cookies.header.rawValue.tooltip=Valor sin tratar almacenado en la cookie
 cookies.header.domain.tooltip=Dominio que ha almacenado la cookie
 cookies.header.size.tooltip=Tamaño de la cookie almacenada
 cookies.header.path.tooltip=Ruta de la carpeta donde está activa la cookie
 cookies.header.expires.tooltip=Fecha de expiración de la cookie
 cookies.header.security.tooltip=Muestra si es una cookie segura o no
-cookies.header.status.tooltip=Estado de la cookie (marcada, revertida, etc)
 cookies.header.httponly.tooltip=Muestra si la cookie es sólo HTTP
 # LOCALIZATION NOTE (cookies.netinfo.Received_Cookies, cookies.netinfo.Sent_Cookies):
 # Labels used in the Firebug's net panel. If there are any cookies associated with a network
@@ -247,7 +247,7 @@ cookies.filter.showRejectedCookiesTooltip=Mostrar en la lista también las cooki
 # LOCALIZATION NOTE (cookies.edit.title, cookies.edit.name.label,
 # cookies.edit.domain.label, cookies.edit.path.label, cookies.edit.expire.label,
 # cookies.edit.value.label, cookies.edit.secure.label, cookies.edit.httponly.label,
-# cookies.edit.session.label): Edit Cookie dialog UI
+# cookies.edit.session.label, cookies.edit.urlEncode.label): Edit Cookie dialog UI
 cookies.edit.title=Editar cookie
 cookies.edit.name.label=Nombre:
 cookies.edit.domain.label=Servidor:
@@ -257,6 +257,7 @@ cookies.edit.value.label=Valor:
 cookies.edit.secure.label=Cookie segura
 cookies.edit.httponly.label=Sólo HTTP
 cookies.edit.session.label=Sesión
+cookies.edit.urlEncode.label=Valor codificación URL
 # LOCALIZATION NOTE (cookies.console.Cookies, cookies.console.Filter_By_Cookies)
 # Label and tooltip for a toolbar button displayed on the Console panel. Used for filtering.
 cookies.console.Cookies=Cookies
diff --git a/extension/locale/es-ES/firebug.properties b/extension/locale/es-ES/firebug.properties
index bba399a666..2e08ca8e64 100644
--- a/extension/locale/es-ES/firebug.properties
+++ b/extension/locale/es-ES/firebug.properties
@@ -40,11 +40,15 @@ firebug.AttachFirebug=Fijar Firebug en la ventana del navegador
 pluralRule=1
 # LOCALIZATION NOTE (plural.Total_Firebugs2): Semicolon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# Used in a tooltip that is displayed for the Firebug icon located within Firefox status bar.
+# Used in a tooltip that is displayed for the Firebug icon located within Firefox toolbar.
 # Displays the number of pages with Firebug activated.
 # %1 = number of Firebug instances activated
 # example: 2 Total Firebugs
 plural.Total_Firebugs2=%1$S Firebug total;%1$S Firebugs totales
+# LOCALIZATION NOTE (startbutton.tip.deactivated):
+# Used in a tooltip that is displayed for the Firebug icon located within Firefox toolbar.
+# Displays the deactivated status of Firebug
+startbutton.tip.deactivated=Desactivado
 # LOCALIZATION NOTE (panel.status): Label showing the status of an activable panel
 # inside a tooltip when hovering the Start Button. Will be shown for each panel.
 # first %S = panel name
@@ -159,8 +163,6 @@ html.option.Show_Entities_As_Names=Mostrar entidades como nombres
 html.option.tip.Show_Entities_As_Names=Mostrar todas las entidades XMl mediante sus nombres
 html.option.Show_Entities_As_Unicode=Mostrar entidades como Unicode
 html.option.tip.Show_Entities_As_Unicode=Mostrar todas las entidades XML mediante su representación Unicode
-ShowTextNodesWithEntities=Mostrar entidades básicas
-html.option.tip.Show_Text_Nodes_With_Entities=Mostrar los caracteres especiales más usuales como entidades
 # LOCALIZATION NOTE (html.option.Highlight_Mutations, html.option.tip.Highlight_Mutations):
 # HTML panel option (located in tab's option menu). If set to true, changes to the nodes
 # will be highlighted
@@ -258,6 +260,8 @@ css.EmptyStyleSheet=No hay reglas. Puede <a>crear una regla</a>.
 css.EmptyElementCSS=Este elemento no tiene reglas de estilo. Puede <a>crear una regla</a> para él.
 EditStyle=Editar estilo del elemento…
 style.tip.Edit_Style=Editar los estilos internos del elemento
+AddRule=Añadir regla…
+css.tip.AddRule=Añadir una regla genérica para este elemento
 NewRule=Nueva regla…
 css.tip.New_Rule=Añadir una nueva regla
 # LOCALIZATION NOTE (css.Delete_Rule, css.tip.Delete_Rule): Menu item label used in the CSS panel context menu.
@@ -580,6 +584,10 @@ RequestHeaders=Encabezados de solicitud
 ResponseHeaders=Encabezados de respuesta
 CachedResponseHeaders=Encabezados de respuesta de la caché
 PostRequestHeaders=Encabezados de respuesta de datos enviados
+# LOCALIZATION NOTE (net.label.ResponseHeadersFromBFCache):
+# Label (noun) used in the Net panel and displayed instead of Response Headers
+# if the response comes directly from the cache (BFCache).
+net.label.ResponseHeadersFromBFCache=La solicitud se resolvió directamente desde la caché, así que no tenemos respuesta del servidor. Vea a continuación la respuesta de caché.
 # LOCALIZATION NOTE (plural.Limit_Exceeded2): Semicolon list of plural forms.
 # A message displayed in the Net panel when some entries must be removed in the case the maximum number
 # of entries has been reached.
@@ -1383,3 +1391,9 @@ firebug.Memory_Profiler_Results=Resultados del analizador de memoria
 # LOCALIZATION NOTE (firebug.Entire_Session):
 # Label used within memory profiler results to mark summary information for entire session.
 firebug.Entire_Session=Toda la sesión
+# LOCALIZATION NOTE (console.msg.nothing_to_output):
+# Used by the console panel if a Console API is used without any argument.
+console.msg.nothing_to_output=(nada que mostrar)
+# LOCALIZATION NOTE (console.msg.nothing_to_output):
+# Used by the console panel if an empty string is passed into a Console API.
+console.msg.an_empty_string=(cadena vacía)
diff --git a/extension/modules/gcli.js b/extension/modules/gcli.js
index 9755edb61e..d729d27669 100644
--- a/extension/modules/gcli.js
+++ b/extension/modules/gcli.js
@@ -32,6 +32,10 @@ var Locale = Cu.import("resource://firebug/locale.js").Locale;
 // ********************************************************************************************* //
 // Command Implementation
 
+/**
+ * Read https://developer.mozilla.org/en/Tools/GCLI/Writing_GCLI_Commands
+ * about how to implement GCLI comands.
+ */
 var FirebugController =
 {
     openFirebug: function(args, context)
diff --git a/tests/content/dom/storage/storage.js b/tests/content/dom/storage/storage.js
index ac867e414e..6df262700c 100644
--- a/tests/content/dom/storage/storage.js
+++ b/tests/content/dom/storage/storage.js
@@ -106,7 +106,7 @@ function testLocalStorageData(callback, win)
     FBTest.waitForDOMProperty("localStorage", function(row)
     {
         var expected = Fx13 ?
-            "\\s*item6=\\\"6\\\",\\s*item7=\\\"7\\\",\\s*" + FW.FBL.$STR("firebug.reps.more") + "...\\s*" :
+            "\\s*item6=\\\"6\\\",\\s*item7=\\\"7\\\",\\s*item0=\\\"0\\\",\\s*" + FW.FBL.$STR("firebug.reps.more") + "...\\s*" :
             "\\s*item6=\\\"6\\\",\\s*item3=\\\"3\\\",\\s*" + FW.FBL.$STR("firebug.reps.more") + "...\\s*";
 
         FBTest.compare(
diff --git a/tests/content/html/5506/issue5506.js b/tests/content/html/5506/issue5506.js
index 38f3fb5c36..ba3b6a9c2e 100644
--- a/tests/content/html/5506/issue5506.js
+++ b/tests/content/html/5506/issue5506.js
@@ -46,7 +46,7 @@ function runTest()
                 {
                     buttons[ind].click();
                     callback();
-                });
+                }, 500);
             }
 
             function verifyHtml(html)