diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 5f39af4..096a5ee 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,67 @@
+-------------------------------------------------------------------
+Sat Sep 22 09:03:53 UTC 2018 - astieger@suse.com
+
+- Mozilla Firefox 62.0.2:
+  MFSA 2018-22
+  * CVE-2018-12385 (boo#1109363, bmo#1490585)
+    Crash in TransportSecurityInfo due to cached data
+  * Unvisited bookmarks can once again be autofilled in the address
+    bar
+  * Fix WebGL rendering issues
+  * Fix fallback on startup when a language pack is missing
+  * Avoid crash when sharing a profile with newer (as yet
+    unreleased) versions of Firefox
+  * Do not undo removal of search engines when using a language
+    pack
+  * Fixed rendering of some web sites
+  * Restored compatibility with some sites using deprecated TLS
+    settings
+- disable rust debug symbols to fix build on %ix86
+
+-------------------------------------------------------------------
+Mon Sep  3 10:47:43 UTC 2018 - wr@rosenauer.org
+
+- update to Firefox 62.0
+  * Firefox Home (the default New Tab) now allows users to display
+    up to 4 rows of top sites, Pocket stories, and highlights
+  * "Reopen in Container" tab menu option appears for users with
+    Containers that lets them choose to reopen a tab in a different
+    container
+  * In advance of removing all trust for Symantec-issued certificates
+    in Firefox 63, a preference was added that allows users to distrust
+    certificates issued by Symantec. To use this preference, go to
+    about:config in the address bar and set the preference
+    "security.pki.distrust_ca_policy" to 2.
+  * Support for CSS Shapes, allowing for richer web page layouts.
+    This goes hand in hand with a brand new Shape Path Editor in the
+    CSS inspector.
+  * CSS Variable Fonts (OpenType Font Variations) support, which makes
+    it possible to create beautiful typography with a single font file
+  * Added Canadian English (en-CA) locale
+  MFSA 2018-20 (bsc#1107343)
+  * CVE-2018-12377 (bmo#1470260)
+    Use-after-free in refresh driver timers
+  * CVE-2018-12378 (bmo#1459383)
+    Use-after-free in IndexedDB
+  * CVE-2018-12379 (bmo#1473113) (updater is disabled for us)
+    Out-of-bounds write with malicious MAR file
+  * CVE-2017-16541 (bmo#1412081)
+    Proxy bypass using automount and autofs
+  * CVE-2018-12381 (bmo#1435319)
+    Dragging and dropping Outlook email message results in page navigation
+  * CVE-2018-12382 (bmo#1479311) (Android only)
+    Addressbar spoofing with javascript URI on Firefox for Android
+  * CVE-2018-12383 (bmo#1475775)
+    Setting a master password post-Firefox 58 does not delete
+    unencrypted previously stored passwords
+  * CVE-2018-12375
+    Memory safety bugs fixed in Firefox 62
+  * CVE-2018-12376
+    Memory safety bugs fixed in Firefox 62 and Firefox ESR 60.2
+- requires NSS >= 3.38
+- removed obsolete patch
+  mozilla-bmo1464766.patch
+
 -------------------------------------------------------------------
 Thu Aug  9 14:22:00 UTC 2018 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index edd7be8..6734eac 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -13,18 +13,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 # changed with every update
-%define major          61
+%define major          62
 %define mainver        %major.0.2
-%define orig_version   61.0.2
+%define orig_version   62.0.2
 %define orig_suffix    %{nil}
 %define update_channel release
 %define branding       1
-%define releasedate    20180807170231
+%define releasedate    20180921000000
 %define source_prefix  firefox-%{orig_version}
 
 # PIE, full relro (x86_64 for now)
@@ -75,7 +75,7 @@ BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.19
-BuildRequires:  mozilla-nss-devel >= 3.37.3
+BuildRequires:  mozilla-nss-devel >= 3.38
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
 BuildRequires:  python3 >= 3.5
@@ -160,7 +160,6 @@ Patch6:         mozilla-reduce-files-per-UnifiedBindings.patch
 Patch7:         mozilla-aarch64-startup-crash.patch
 Patch8:         mozilla-bmo256180.patch
 Patch9:         mozilla-no-return.patch
-Patch10:        mozilla-bmo1464766.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -271,7 +270,6 @@ cd $RPM_BUILD_DIR/%{source_prefix}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -347,11 +345,15 @@ ac_add_options --enable-pie
 %if 0%{?suse_version} > 1320
 ac_add_options --enable-optimize="-g -O2"
 %endif
-%ifarch %ix86 %arm
+%ifarch %arm
 %if 0%{?suse_version} > 1230
 ac_add_options --disable-optimize
 %endif
 %endif
+# bmo#1441155 - Disable the generation of Rust debug symbols on Linux32
+%ifarch %ix86
+ac_add_options --disable-debug-symbols
+%endif
 %ifarch %arm
 ac_add_options --disable-elf-hack
 %endif
@@ -372,6 +374,7 @@ ac_add_options --enable-startup-notification
 ac_add_options --enable-update-channel=%{update_channel}
 ac_add_options --with-mozilla-api-keyfile=%{SOURCE18}
 ac_add_options --with-google-api-keyfile=%{SOURCE19}
+ac_add_options --with-unsigned-addon-scopes=app
 %if %branding
 ac_add_options --enable-official-branding
 %endif
@@ -508,7 +511,6 @@ rm -f %{buildroot}%{progdir}/old-homepage-default.properties
 rm -f %{buildroot}%{progdir}/run-mozilla.sh
 rm -f %{buildroot}%{progdir}/LICENSE
 rm -f %{buildroot}%{progdir}/precomplete
-rm -f %{buildroot}%{progdir}/dictionaries/en-US*
 rm -f %{buildroot}%{progdir}/update-settings.ini
 # devel
 mkdir -p %{buildroot}%{_bindir}
@@ -586,7 +588,6 @@ exit 0
 %dir %{progdir}/distribution/
 %{progdir}/distribution/extensions/
 %{progdir}/defaults/
-%{progdir}/dictionaries/
 %dir %{progdir}/gtk2
 %{progdir}/gtk2/libmozgtk.so
 %{progdir}/gmp-clearkey/
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index c1c9220..f3dee8a 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6e345d53252f5367425ef8a382b578f66d9d71b265298fcbcd24756c9fc71d5
-size 28392
+oid sha256:86585e8285593e3a08c14dc238df48a071284127a540dd628a9f468d0d296c12
+size 28832
diff --git a/create-tar.sh b/create-tar.sh
index b57fa2b..ad56f26 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -7,8 +7,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_61_0_2_RELEASE"
-VERSION="61.0.2"
+RELEASE_TAG="150c70d39363b57ea4e92fbbd900b338f09177d6"
+VERSION="62.0.2"
 VERSION_SUFFIX=""
 LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json"
 
diff --git a/firefox-61.0.2.source.tar.xz b/firefox-61.0.2.source.tar.xz
deleted file mode 100644
index 7ddf197..0000000
--- a/firefox-61.0.2.source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c
-size 266077556
diff --git a/firefox-61.0.2.source.tar.xz.asc b/firefox-61.0.2.source.tar.xz.asc
deleted file mode 100644
index ba236d9..0000000
--- a/firefox-61.0.2.source.tar.xz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAABCAAGBQJbafHXAAoJELu+vbskxvNVIhMP/2VqScRCb6eW+UsdFHrFLQHg
-APpDgdjc/lKVUN8Zrm4uazM9eutozPTBIvXUGFtIewCA6XNdqdJ9V3qXGUIe+eY0
-dd2BQhHjHCgN1viqvKMtvyC5elAlW4je0r20ON6/ODp2ltFEplWkzPRdvMJdj81c
-R+LWlI4BtT7R54wGKeOKmn2L4xx6SYMAfYShMDaeWxT4KywYWFIDf2Is7ogLJpH4
-cPzvuPkUdZPcZ0r3clp/DbNHB5NLrmcrKk1rD1LndKoe45qb75ZDKK4Vsc9I98VW
-pRxNQwvg01bbo4S/Qc4MgyGQBoaW+5H2NuwOLhIsbN3+vK4bfjF+/TQ4ZTtpyBbV
-vTjvnEq7WzrNqwVWkLjZINdeByADyLDMGilSHBiV3D1/Ueafzd81fwuroqC8FEil
-Z2uVmFaK7flERMpcPPV9hk3g9vXn28g9Pe0Gk51Sro0mGiFSh/6C5ROeS3+LV96Q
-TPVzptkkhwjKF8BnOgK1kkwNhk5/KTEBYAOuGefXrTnddaKpMiaDOQAVA3mZaIU4
-VyzFh9v7sWQIl1c0iuE115Z33WoY7iPC+YY9DVhvUbeA+/XuzG/8CuqXPLrjE5Zp
-Ljww6gv+r+/tZGKEF/dLmQw2WOpP9KwXvn21xyzMeltrmRCpG55v+Q3cyzlAExby
-MKFxldx23Uvzqxzj1qoi
-=Qg+b
------END PGP SIGNATURE-----
diff --git a/firefox-62.0.2.source.tar.xz b/firefox-62.0.2.source.tar.xz
new file mode 100644
index 0000000..65a537a
--- /dev/null
+++ b/firefox-62.0.2.source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0474ce1bc9ed512e926d2d58d570e93f958f32bb7da755008e8fedca94f0e2ad
+size 258831964
diff --git a/firefox-62.0.2.source.tar.xz.asc b/firefox-62.0.2.source.tar.xz.asc
new file mode 100644
index 0000000..17dd2e6
--- /dev/null
+++ b/firefox-62.0.2.source.tar.xz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCAAGBQJbo9BZAAoJELu+vbskxvNV1YcQAKD2cZpaBvIHDOKbAWsuDDxO
+czRU6b8mB9wJCGZzaktjv9m8yMZRVjK05EvOzfJM2QjrouE3YvFcQxz8cCnL9/Ql
+eVRMAWMEIQoSIoM+fhGjHXZTEM/xpgRYFuBDNrvDVnIfkc7hIEkJbmg3v3Qdq5/6
+03R4YR1JOuxA22laYLjTyIVcD7iAYpbM+GC7sfLv1XLPAWl/os0/Y96dYReLLPtQ
+fDcCscw0B0vLDihHGZN88jQUXpuzphJSPqmoWS4fUC3JL3Ksj/JMctn22PmwzeGu
+R/PmrRB7KKLzZdTRWGL7yn9oVWxHIDNvhczoF9wbEpGdq+FQrKf2GWtVkTIpyXTz
+A9Bp2o/JaeAeoel7+PNl/rf8XehNuVACnyUMG8qikOwW7LOV4HKK+fdZETztwHZU
+l1Sa1MiuBKrpCdGy9d2TRZBnplRlQU32LDczBBqm8RKWi2REZxwZejGvWN5Opcox
+P11tnG1fmnnLCWQPuYAycnBVEuM/4SVdEXSFDE0ysZK2P0E87mi0WVZzGXvLFpon
+tnkHBkag+HlPbDnTUjYspRTO65tLaQDVIleV9fhVWd/YfK+YgguSv+9CtWKcq8cF
+s3bvGW+LKO3F6tB10rlG9CHSTO69jkYKUS5Puvxm5BzMPX8ZwH0OI70VjLcR1i2J
+z3HlK8VrTJhyXZuJV9O3
+=iVXX
+-----END PGP SIGNATURE-----
diff --git a/firefox-kde.patch b/firefox-kde.patch
index 7b11b84..52d698a 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  242712e5a1879111d1a93a5d55dfae3fd5d47abc
+# Parent  0629fb9c6879e14c1b5e3cbff53b0d44371f0127
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1293 @@
+@@ -0,0 +1,1291 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -21,6 +21,7 @@ new file mode 100644
 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
++<?xml-stylesheet href="chrome://browser/skin/searchbar.css"?>
 +<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
 +<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
@@ -107,6 +108,8 @@ new file mode 100644
 +      <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
 +      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
++      <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
++                oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
 +      <menuseparator/>
 +      <menuitem id="context_pinTab" label="&pinTab.label;"
 +                accesskey="&pinTab.accesskey;"
@@ -117,6 +120,13 @@ new file mode 100644
 +      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
 +                accesskey="&duplicateTab.accesskey;"
 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
++      <menu id="context_reopenInContainer"
++            label="&reopenInContainer.label;"
++            accesskey="&reopenInContainer.accesskey;"
++            hidden="true">
++        <menupopup oncommand="reopenInContainer(event);"
++                   onpopupshowing="return createReopenInContainerMenu(event);" />
++      </menu>
 +      <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
 +                accesskey="&moveToNewWindow.accesskey;"
 +                tbattr="tabbrowser-multiple"
@@ -147,6 +157,9 @@ new file mode 100644
 +                observes="History:UndoCloseTab"/>
 +      <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
 +                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
++      <menuitem id="context_closeSelectedTabs" label="&closeSelectedTabs.label;"
++                hidden="true" accesskey="&closeSelectedTabs.accesskey;"
++                oncommand="gBrowser.removeMultiSelectedTabs();"/>
 +    </menupopup>
 +
 +    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
@@ -226,17 +239,16 @@ new file mode 100644
 +           tabspecific="true"
 +           onpopupshown="StarUI.panelShown(event);"
 +           aria-labelledby="editBookmarkPanelTitle">
-+      <row id="editBookmarkPanelHeader" align="center" hidden="true">
-+        <vbox align="center">
-+          <image id="editBookmarkPanelStarIcon"/>
-+        </vbox>
-+        <vbox>
-+          <label id="editBookmarkPanelTitle"/>
-+          <description id="editBookmarkPanelDescription"/>
-+        </vbox>
-+      </row>
++      <box class="panel-header">
++        <label id="editBookmarkPanelTitle"/>
++      </box>
++      <html:div id="editBookmarkPanelFaviconContainer">
++        <html:img id="editBookmarkPanelFavicon"/>
++      </html:div>
++      <box id="editBookmarkPanelImage"/>
 +#include ../../components/places/content/editBookmarkPanel.inc.xul
-+      <hbox id="editBookmarkPanelBottomButtons" pack="end">
++      <hbox id="editBookmarkPanelBottomButtons"
++            style="min-width: 30em;">
 +#ifdef XP_UNIX
 +        <button id="editBookmarkPanelDoneButton"
 +                class="editBookmarkPanelBottomButton"
@@ -245,13 +257,11 @@ new file mode 100644
 +                oncommand="StarUI.panel.hidePopup();"/>
 +        <button id="editBookmarkPanelRemoveButton"
 +                class="editBookmarkPanelBottomButton"
-+                oncommand="StarUI.removeBookmarkButtonCommand();"
-+                accesskey="&editBookmark.removeBookmark.accessKey;"/>
++                oncommand="StarUI.removeBookmarkButtonCommand();"/>
 +#else
 +        <button id="editBookmarkPanelRemoveButton"
 +                class="editBookmarkPanelBottomButton"
-+                oncommand="StarUI.removeBookmarkButtonCommand();"
-+                accesskey="&editBookmark.removeBookmark.accessKey;"/>
++                oncommand="StarUI.removeBookmarkButtonCommand();"/>
 +        <button id="editBookmarkPanelDoneButton"
 +                class="editBookmarkPanelBottomButton"
 +                label="&editBookmark.done.label;"
@@ -340,12 +350,24 @@ new file mode 100644
 +    </panel>
 +
 +    <menupopup id="toolbar-context-menu"
-+               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
++               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator')); UpdateDownloadsAutoHide(this); UpdateManageExtension(this)">
++      <menuitem oncommand="openAboutAddonsForContextAction(this.parentElement)"
++                accesskey="&customizeMenu.manageExtension.accesskey;"
++                label="&customizeMenu.manageExtension.label;"
++                contexttype="toolbaritem"
++                class="customize-context-manageExtension"/>
++      <menuseparator/>
 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
 +                label="&customizeMenu.pinToOverflowMenu.label;"
 +                contexttype="toolbaritem"
 +                class="customize-context-moveToPanel"/>
++      <menuitem oncommand="onDownloadsAutoHideChange(event)"
++                type="checkbox"
++                accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"
++                label="&customizeMenu.autoHideDownloadsButton.label;"
++                contexttype="toolbaritem"
++                class="customize-context-autoHide"/>
 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
 +                label="&customizeMenu.removeFromToolbar.label;"
@@ -422,17 +444,8 @@ new file mode 100644
 +#include ../../components/places/content/placesContextMenu.inc.xul
 +
 +    <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
-+      <hbox>
-+        <button class="ctrlTab-preview" flex="1"/>
-+        <button class="ctrlTab-preview" flex="1"/>
-+        <button class="ctrlTab-preview" flex="1"/>
-+        <button class="ctrlTab-preview" flex="1"/>
-+        <button class="ctrlTab-preview" flex="1"/>
-+        <button class="ctrlTab-preview" flex="1"/>
-+      </hbox>
-+      <hbox pack="center">
-+        <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
-+      </hbox>
++      <hbox id="ctrlTab-previews"/>
++      <hbox id="ctrlTab-showAll-container" pack="center"/>
 +    </panel>
 +
 +    <panel id="pageActionPanel"
@@ -460,21 +473,19 @@ new file mode 100644
 +        </panelview>
 +      </panelmultiview>
 +    </panel>
-+    <panel id="pageActionFeedback"
++
++    <panel id="confirmation-hint"
 +           role="alert"
 +           type="arrow"
 +           hidden="true"
 +           flip="slide"
 +           position="bottomcenter topright"
 +           tabspecific="true"
-+           noautofocus="true"
-+           copyURLFeedback="&copyURLFeedback.label;"
-+           sendToDeviceFeedback="&sendToDeviceFeedback.label;"
-+           sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
-+      <hbox id="pageActionFeedbackAnimatableBox">
-+        <image id="pageActionFeedbackAnimatableImage"/>
++           noautofocus="true">
++      <hbox id="confirmation-hint-checkmark-animation-container">
++        <image id="confirmation-hint-checkmark-image"/>
 +      </hbox>
-+      <label id="pageActionFeedbackMessage"/>
++      <label id="confirmation-hint-message"/>
 +    </panel>
 +
 +    <menupopup id="pageActionContextMenu"
@@ -524,6 +535,7 @@ new file mode 100644
 +#include ../../components/customizableui/content/panelUI.inc.xul
 +#include ../../components/controlcenter/content/panel.inc.xul
 +#include ../../components/downloads/content/downloadsPanel.inc.xul
++#include browser-allTabsMenu.inc.xul
 +
 +    <hbox id="downloads-animation-container" mousethrough="always">
 +      <vbox id="downloads-notification-anchor" hidden="true">
@@ -675,29 +687,10 @@ new file mode 100644
 +
 +      <toolbarbutton id="alltabs-button"
 +                     class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
-+                     type="menu"
++                     oncommand="gTabsPanel.showAllTabsPanel();"
 +                     label="&listAllTabs.label;"
 +                     tooltiptext="&listAllTabs.label;"
-+                     removable="false">
-+        <menupopup id="alltabs-popup"
-+                   position="after_end">
-+          <menuitem id="alltabs_undoCloseTab"
-+                    key="key_undoCloseTab"
-+                    label="&undoCloseTab.label;"
-+                    observes="History:UndoCloseTab"/>
-+          <menuseparator id="alltabs-popup-separator-1"/>
-+          <menu id="alltabs_containersTab"
-+                label="&newUserContext.label;">
-+            <menupopup id="alltabs_containersMenuTab" />
-+          </menu>
-+          <menuseparator id="alltabs-popup-separator-2"/>
-+          <menu id="alltabs_hiddenTabs"
-+                label="&hiddenTabs.label;">
-+            <menupopup id="alltabs_hiddenTabsMenu"/>
-+          </menu>
-+          <menuseparator id="alltabs-popup-separator-3"/>
-+        </menupopup>
-+      </toolbarbutton>
++                     removable="false"/>
 +
 +      <hbox class="titlebar-placeholder" type="post-tabs"
 +            ordinal="1000"
@@ -778,7 +771,7 @@ new file mode 100644
 +                       key="goHome"
 +                       onclick="BrowserGoHome(event);"
 +                       cui-areatype="toolbar"
-+                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
++                       aboutHomeOverrideTooltip="&homeButton.defaultPage.tooltip;"/>
 +        <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
 +                     removable="false"
@@ -826,6 +819,8 @@ new file mode 100644
 +                         tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
 +                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
 +                         tooltiptext="&urlbar.popupBlocked.tooltip;"/>
++                  <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
++                         tooltiptext="&urlbar.autoplayMediaBlocked.tooltip;"/>
 +                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
 +                         tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
 +                  <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button"
@@ -842,6 +837,8 @@ new file mode 100644
 +                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
 +                  <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
 +                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
++                  <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
++                         tooltiptext="&urlbar.autoplayNotificationAnchor.tooltip;"/>
 +                  <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
 +                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
 +                  <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
@@ -1137,7 +1134,7 @@ new file mode 100644
 +                       placespopup="true"
 +                       context="placesContext"
 +                       onpopupshowing="if (!this.parentNode._placesView)
-+                                         new PlacesMenu(event, 'place:folder=TOOLBAR',
++                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`,
 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
 +              <menuitem id="BMB_viewBookmarksToolbar"
 +                        class="menuitem-iconic subviewbutton"
@@ -1156,7 +1153,7 @@ new file mode 100644
 +                       placespopup="true"
 +                       context="placesContext"
 +                       onpopupshowing="if (!this.parentNode._placesView)
-+                                         new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
++                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`,
 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
 +          </menu>
 +          <menu id="BMB_mobileBookmarks"
@@ -1168,7 +1165,7 @@ new file mode 100644
 +                       placespopup="true"
 +                       context="placesContext"
 +                       onpopupshowing="if (!this.parentNode._placesView)
-+                                         new PlacesMenu(event, 'place:folder=MOBILE_BOOKMARKS',
++                                         new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.mobileGuid}`,
 +                                                        PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
 +          </menu>
 +
@@ -1224,9 +1221,10 @@ new file mode 100644
 +      <vbox id="appcontent" flex="1">
 +        <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
 +        <tabbox id="tabbrowser-tabbox"
-+                    flex="1" eventnode="document" tabcontainer="tabbrowser-tabs"
-+                    onselect="if (event.target.localName == 'tabpanels') gBrowser.updateCurrentBrowser();">
-+          <tabpanels flex="1" class="plain" selectedIndex="0" id="tabbrowser-tabpanels">
++                flex="1" eventnode="document" tabcontainer="tabbrowser-tabs">
++          <tabpanels id="tabbrowser-tabpanels"
++                     flex="1" class="plain" selectedIndex="0"
++                     onselect="if (event.target == this) gBrowser.updateCurrentBrowser();">
 +            <notificationbox flex="1" notificationside="top">
 +              <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
 +                   We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
@@ -1302,7 +1300,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -44,16 +44,18 @@ browser.jar:
+@@ -24,16 +24,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
@@ -1314,13 +1312,13 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
          content/browser/browser-addons.js             (content/browser-addons.js)
+         content/browser/browser-allTabsMenu.js        (content/browser-allTabsMenu.js)
          content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
          content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
          content/browser/browser-customization.js      (content/browser-customization.js)
          content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
          content/browser/browser-compacttheme.js       (content/browser-compacttheme.js)
  #ifndef MOZILLA_OFFICIAL
-         content/browser/browser-development-helpers.js (content/browser-development-helpers.js)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1341,9 +1339,9 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
  #include "nsIEHistoryEnumerator.h"
  #endif
  
- #include "rdf.h"
  #include "nsFeedSniffer.h"
-@@ -31,18 +31,16 @@ using namespace mozilla::browser;
+ #include "AboutRedirector.h"
+@@ -30,18 +30,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1362,7 +1360,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
  
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
  
-@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
+@@ -59,17 +57,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
  NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
  #endif
  
@@ -1384,7 +1382,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
 --- a/browser/components/preferences/in-content/main.js
 +++ b/browser/components/preferences/in-content/main.js
-@@ -327,16 +327,23 @@ var gMainPane = {
+@@ -321,16 +321,23 @@ var gMainPane = {
            this._backoffIndex++ : backoffTimes.length - 1]);
        };
  
@@ -1408,7 +1406,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
      performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
  
      this.updateDefaultPerformanceSettingsPref();
-@@ -868,16 +875,27 @@ var gMainPane = {
+@@ -861,16 +868,27 @@ var gMainPane = {
        // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
        this._backoffIndex = 0;
  
@@ -1752,9 +1750,9 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -452,16 +452,18 @@
- @RESPATH@/browser/defaults/blocklists
- @RESPATH@/browser/defaults/pinning
+@@ -455,16 +455,18 @@
+ @RESPATH@/browser/defaults/settings/pinning
+ @RESPATH@/browser/defaults/settings/main
  
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  ; Technically this is an app pref file, but we are keeping it in the original
diff --git a/l10n-61.0.2.tar.xz b/l10n-61.0.2.tar.xz
deleted file mode 100644
index 134a5b8..0000000
--- a/l10n-61.0.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62573cc33c88ddce50110232f099ecc9f4f8c399331bdd525e912f53bf60c569
-size 50097996
diff --git a/l10n-62.0.2.tar.xz b/l10n-62.0.2.tar.xz
new file mode 100644
index 0000000..d48b541
--- /dev/null
+++ b/l10n-62.0.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d95b3c654cdec80c6af6a2defb9d1e4546f6ee8ff24012a84a18af55d5d28d2c
+size 54178504
diff --git a/mozilla-aarch64-startup-crash.patch b/mozilla-aarch64-startup-crash.patch
index 0d0ea61..8643f18 100644
--- a/mozilla-aarch64-startup-crash.patch
+++ b/mozilla-aarch64-startup-crash.patch
@@ -1,12 +1,12 @@
 # HG changeset patch
 # Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10
-# Parent  3005da37da3f1e2c568b1675307d10860182d214
+# Parent  07236b512cd930e3fc7a94fed549431ccaa51c90
 Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage
 
 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
 --- a/netwerk/base/nsIOService.cpp
 +++ b/netwerk/base/nsIOService.cpp
-@@ -887,17 +887,23 @@ nsIOService::NewChannelFromURIWithProxyF
+@@ -923,17 +923,23 @@ nsIOService::NewChannelFromURIWithProxyF
                      "doesn't support nsIUploadChannel2. An extension has "
                      "supplied a non-functional http protocol handler. This will "
                      "break behavior and in future releases not work at all.");
@@ -29,4 +29,4 @@ diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
  nsIOService::NewChannelFromURIWithProxyFlags2(nsIURI* aURI,
                                                nsIURI* aProxyURI,
                                                uint32_t aProxyFlags,
-                                               nsIDOMNode* aLoadingNode,
+                                               nsINode* aLoadingNode,
diff --git a/mozilla-bmo1464766.patch b/mozilla-bmo1464766.patch
deleted file mode 100644
index 2c35caa..0000000
--- a/mozilla-bmo1464766.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1527491713 -32400
-# Node ID c28becad0c10b906454d7e424f9a9402799ea8dd
-# Parent  86eaa6799cf51660c0b598937121305b8f70c84d
-Bug 1464766 - Allow to relax the addon signature requirements. r?rhelmer
-
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -1134,16 +1134,19 @@ pref("print.print_via_parent", true);
- pref("print.print_via_parent", false);
- #endif
- 
- // Pref used by the spellchecker extension to control the
- // maximum number of misspelled words that will be underlined
- // in a document.
- pref("extensions.spellcheck.inline.max-misspellings", 500);
- 
-+// Add-on manager scoped allowing unsigned addons. None by default.
-+pref("extensions.unsignedScopes", 12, locked);
-+
- // Prefs used by libeditor. Prefs specific to seamonkey composer
- // belong in comm-central/editor/ui/composer.js
- 
- pref("editor.use_custom_colors", false);
- pref("editor.singleLine.pasteNewlines",      2);
- pref("editor.use_css",                       false);
- pref("editor.css.default_length_unit",       "px");
- pref("editor.resizing.preserve_ratio",       true);
-diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
---- a/toolkit/mozapps/extensions/content/extensions.js
-+++ b/toolkit/mozapps/extensions/content/extensions.js
-@@ -42,16 +42,17 @@ XPCOMUtils.defineLazyPreferenceGetter(th
- const PREF_DISCOVERURL = "extensions.webservice.discoverURL";
- const PREF_DISCOVER_ENABLED = "extensions.getAddons.showPane";
- const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled";
- const PREF_GETADDONS_CACHE_ID_ENABLED = "extensions.%ID%.getAddons.cache.enabled";
- const PREF_UI_TYPE_HIDDEN = "extensions.ui.%TYPE%.hidden";
- const PREF_UI_LASTCATEGORY = "extensions.ui.lastCategory";
- const PREF_LEGACY_EXCEPTIONS = "extensions.legacy.exceptions";
- const PREF_LEGACY_ENABLED = "extensions.legacy.enabled";
-+const PREF_UNSIGNED_SCOPES = "extensions.unsignedScopes";
- 
- const LOADING_MSG_DELAY = 100;
- 
- const UPDATES_RECENT_TIMESPAN = 2 * 24 * 3600000; // 2 days (in milliseconds)
- const UPDATES_RELEASENOTES_TRANSFORMFILE = "chrome://mozapps/content/extensions/updateinfo.xsl";
- 
- const XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml";
- 
-@@ -223,19 +224,21 @@ function loadView(aViewId) {
- 
- function isCorrectlySigned(aAddon) {
-   // Add-ons without an "isCorrectlySigned" property are correctly signed as
-   // they aren't the correct type for signing.
-   return aAddon.isCorrectlySigned !== false;
- }
- 
- function isDisabledUnsigned(addon) {
--  let signingRequired = (addon.type == "locale") ?
--                        AddonSettings.LANGPACKS_REQUIRE_SIGNING :
--                        AddonSettings.REQUIRE_SIGNING;
-+  let unsignedScopes = Services.prefs.getIntPref(PREF_UNSIGNED_SCOPES, 0);
-+  let signingRequired = !(addon.scope & unsignedScopes) &&
-+                        ((addon.type == "locale") ?
-+                         AddonSettings.LANGPACKS_REQUIRE_SIGNING :
-+                         AddonSettings.REQUIRE_SIGNING);
-   return signingRequired && !isCorrectlySigned(addon);
- }
- 
- function isLegacyExtension(addon) {
-   let legacy = false;
-   if (addon.type == "extension" && !addon.isWebExtension) {
-     legacy = true;
-   }
-diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
---- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-@@ -78,16 +78,17 @@ const KEY_PROFILEDIR                  = 
- const FILE_JSON_DB                    = "extensions.json";
- 
- // The last version of DB_SCHEMA implemented in SQLITE
- const LAST_SQLITE_DB_SCHEMA           = 14;
- 
- const PREF_BLOCKLIST_ITEM_URL         = "extensions.blocklist.itemURL";
- const PREF_DB_SCHEMA                  = "extensions.databaseSchema";
- const PREF_EM_AUTO_DISABLED_SCOPES    = "extensions.autoDisableScopes";
-+const PREF_EM_UNSIGNED_SCOPES         = "extensions.unsignedScopes";
- const PREF_EM_EXTENSION_FORMAT        = "extensions.";
- const PREF_PENDING_OPERATIONS         = "extensions.pendingOperations";
- const PREF_XPI_SIGNATURES_DEV_ROOT    = "xpinstall.signatures.dev-root";
- 
- const TOOLKIT_ID                      = "toolkit@mozilla.org";
- 
- const KEY_APP_SYSTEM_ADDONS           = "app-system-addons";
- const KEY_APP_SYSTEM_DEFAULTS         = "app-system-defaults";
-@@ -1959,17 +1960,19 @@ this.XPIDatabase = {
-    * Calculates whether an add-on should be appDisabled or not.
-    *
-    * @param {AddonInternal} aAddon
-    *        The add-on to check
-    * @returns {boolean}
-    *        True if the add-on should not be appDisabled
-    */
-   isUsableAddon(aAddon) {
--    if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) {
-+    let unsignedScopes = Services.prefs.getIntPref(PREF_EM_UNSIGNED_SCOPES, 0);
-+    if (!(aAddon._installLocation.scope & unsignedScopes) &&
-+        this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) {
-       logger.warn(`Add-on ${aAddon.id} is not correctly signed.`);
-       if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) {
-         logger.warn(`Preference ${PREF_XPI_SIGNATURES_DEV_ROOT} is set.`);
-       }
-       return false;
-     }
- 
-     if (aAddon.blocklistState == nsIBlocklistService.STATE_BLOCKED) {
diff --git a/mozilla-kde.patch b/mozilla-kde.patch
index 26bf17a..9cbcc87 100644
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  8671b358718cb8898a55fada20fc9999408daefe
+# Parent  989a507ffc5faf9a3bd950c2391a24afa9f463c8
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  using namespace mozilla;
  
  #ifdef DEBUG
-@@ -4201,25 +4202,37 @@ Preferences::InitInitialObjects(bool aIs
+@@ -4189,25 +4190,37 @@ Preferences::InitInitialObjects(bool aIs
    // application pref files for backwards compatibility.
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -65,7 +65,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
  
    // Load jar:$app/omni.jar!/defaults/preferences/*.js
    // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4268,17 +4281,17 @@ Preferences::InitInitialObjects(bool aIs
+@@ -4256,17 +4269,17 @@ Preferences::InitInitialObjects(bool aIs
        }
  
        nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -132,7 +132,7 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py
 +++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -34,16 +34,17 @@ class ManifestEntry(object):
+@@ -39,16 +39,17 @@ class ManifestEntry(object):
          'platformversion',
          'os',
          'osversion',
@@ -171,7 +171,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -68,16 +68,18 @@ toolkit.jar:
+@@ -69,16 +69,18 @@ toolkit.jar:
     content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
     content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
     content/global/bindings/datekeeper.js       (widgets/datekeeper.js)
@@ -848,7 +848,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -65,17 +65,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -71,17 +71,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
          '../components/printingui',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
@@ -1291,7 +1291,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
  using mozilla::dom::RemoteHandlerApp;
  
  namespace {
-@@ -264,17 +264,17 @@ HandlerServiceParent::RecvExists(const H
+@@ -265,17 +265,17 @@ HandlerServiceParent::RecvExists(const H
  }
  
  mozilla::ipc::IPCResult
@@ -2166,7 +2166,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    const char* directive;
    int argc;
  
-@@ -441,16 +442,17 @@ ParseManifest(NSLocationType aType, File
+@@ -437,16 +438,17 @@ ParseManifest(NSLocationType aType, File
    NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
    NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
    NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -2184,7 +2184,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
    NS_NAMED_LITERAL_STRING(kMain, "main");
    NS_NAMED_LITERAL_STRING(kContent, "content");
  
-@@ -496,44 +498,49 @@ ParseManifest(NSLocationType aType, File
+@@ -492,44 +494,49 @@ ParseManifest(NSLocationType aType, File
          CopyUTF8toUTF16(s, abi);
          abi.Insert(char16_t('_'), 0);
          abi.Insert(osTarget, 0);
@@ -2234,7 +2234,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
      process = kMain;
    }
  
-@@ -635,25 +642,27 @@ ParseManifest(NSLocationType aType, File
+@@ -631,25 +638,27 @@ ParseManifest(NSLocationType aType, File
      TriState stOsVersion = eUnspecified;
      TriState stOs = eUnspecified;
      TriState stABI = eUnspecified;
@@ -2262,7 +2262,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
        }
  
  #if defined(MOZ_WIDGET_ANDROID)
-@@ -698,16 +707,17 @@ ParseManifest(NSLocationType aType, File
+@@ -694,16 +703,17 @@ ParseManifest(NSLocationType aType, File
      }
  
      if (!ok ||
@@ -2300,7 +2300,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -46,16 +46,17 @@
+@@ -47,16 +47,17 @@
  #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
@@ -2318,14 +2318,14 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1955,59 +1956,74 @@ nsLocalFile::SetPersistentDescriptor(con
-   return InitWithNativePath(aPersistentDescriptor);
- #endif
- }
- 
+@@ -1999,63 +2000,78 @@ nsLocalFile::SetPersistentDescriptor(con
  NS_IMETHODIMP
  nsLocalFile::Reveal()
  {
+   if (!FilePreferences::IsAllowedPath(mPath)) {
+     return NS_ERROR_FILE_ACCESS_DENIED;
+   }
+ 
  #ifdef MOZ_WIDGET_GTK
 -  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 -  if (!giovfs) {
@@ -2384,6 +2384,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  NS_IMETHODIMP
  nsLocalFile::Launch()
  {
+   if (!FilePreferences::IsAllowedPath(mPath)) {
+     return NS_ERROR_FILE_ACCESS_DENIED;
+   }
+ 
  #ifdef MOZ_WIDGET_GTK
 +  if( nsKDEUtils::kdeSupport()) {
 +    nsTArray<nsCString> command;
diff --git a/source-stamp.txt b/source-stamp.txt
index 8db705a..9b27bdc 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=975058795980
+REV=150c70d39363
 REPO=http://hg.mozilla.org/releases/mozilla-release