From d13830aaa44daece600fc414b57d8d277d01f0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 19 Mar 2015 15:50:23 -0700
Subject: [PATCH 01/80] Bug 1144377 - hover state on reading list sidebar items
 remains after the mouse leaves the list, r=jaws.

---
 browser/components/readinglist/sidebar.js         | 13 ++++++-------
 browser/themes/shared/readinglist/sidebar.inc.css |  3 ++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/components/readinglist/sidebar.js b/browser/components/readinglist/sidebar.js
index bc943110a295..e4e3a5c833b5 100644
--- a/browser/components/readinglist/sidebar.js
+++ b/browser/components/readinglist/sidebar.js
@@ -165,7 +165,7 @@ let RLSidebar = {
   },
 
   /**
-   * The currently active element in the list.
+   * The list item displayed in the current tab.
    * @type {Element}
    */
   get activeItem() {
@@ -204,7 +204,7 @@ let RLSidebar = {
   },
 
   /**
-   * The currently selected item in the list.
+   * The list item selected with the keyboard.
    * @type {Element}
    */
   get selectedItem() {
@@ -366,15 +366,14 @@ let RLSidebar = {
   },
 
   /**
-   * Handle a mousemove event over the list box.
+   * Handle a mousemove event over the list box:
+   * If the hovered item isn't the selected one, clear the selection.
    * @param {Event} event - Triggering event.
    */
   onListMouseMove(event) {
     let itemNode = this.findParentItemNode(event.target);
-    if (!itemNode)
-      return;
-
-    this.selectedItem = itemNode;
+    if (itemNode != this.selectedItem)
+      this.selectedItem = null;
   },
 
   /**
diff --git a/browser/themes/shared/readinglist/sidebar.inc.css b/browser/themes/shared/readinglist/sidebar.inc.css
index 108e323363fe..b198f909cc75 100644
--- a/browser/themes/shared/readinglist/sidebar.inc.css
+++ b/browser/themes/shared/readinglist/sidebar.inc.css
@@ -84,11 +84,12 @@ body {
   color: #008ACB;
 }
 
-.item:not(:hover) .remove-button {
+.item:not(:hover):not(.selected) .remove-button {
   display: none;
 }
 
 .remove-button {
+  padding: 0;
   width: 16px;
   height: 16px;
   background-size: contain;

From 14ff6d0c0642f179bd784b40a022abc42f749081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 19 Mar 2015 15:50:23 -0700
Subject: [PATCH 02/80] Bug 1144675 - The Reading List button from the Location
 Bar should have a distinct icon for pages currently in the list, r=markh.

--HG--
rename : browser/themes/shared/readinglist.inc.css => browser/themes/shared/readinglist/readinglist.inc.css
---
 browser/themes/linux/browser.css              |  2 +-
 browser/themes/osx/browser.css                |  2 +-
 browser/themes/shared/readinglist/icons.svg   | 31 +++++++++----------
 .../{ => readinglist}/readinglist.inc.css     |  9 ++++--
 browser/themes/windows/browser.css            |  2 +-
 5 files changed, 24 insertions(+), 22 deletions(-)
 rename browser/themes/shared/{ => readinglist}/readinglist.inc.css (85%)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 899255777820..40d21867ffd5 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1628,7 +1628,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/Info.png");
 }
 
-%include ../shared/readinglist.inc.css
+%include ../shared/readinglist/readinglist.inc.css
 
 /* Reader mode button */
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 648ccaf17ab7..237edea7da95 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2527,7 +2527,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   }
 }
 
-%include ../shared/readinglist.inc.css
+%include ../shared/readinglist/readinglist.inc.css
 
 /* Reader mode button */
 
diff --git a/browser/themes/shared/readinglist/icons.svg b/browser/themes/shared/readinglist/icons.svg
index 364d25c83ca9..c859ae226dfd 100644
--- a/browser/themes/shared/readinglist/icons.svg
+++ b/browser/themes/shared/readinglist/icons.svg
@@ -13,25 +13,15 @@
         display: none;
       }
 
-      #addpage {
+      #addpage, #alreadyadded {
         fill: #808080;
       }
-      #addpage-hover {
+      #addpage-hover, #alreadyadded-hover {
         fill: #555555;
       }
-      #addpage-active {
+      #addpage-active, #alreadyadded-active {
         fill: #0095DD;
       }
-
-      #alreadyadded {
-        fill: #0095DD;
-      }
-      #alreadyadded-hover {
-        fill: #555555;
-      }
-      #alreadyadded-active {
-        fill: #808080;
-      }
     </style>
 
     <mask id="plus-mask">
@@ -40,18 +30,27 @@
       <rect x="7.5" y="4" width="1" height="8"/>
     </mask>
 
+    <mask id="minus-mask">
+      <rect width="100%" height="100%" fill="white"/>
+      <rect x="4" y="7.5" width="8" height="1"/>
+    </mask>
+
     <g id="addpage-shape">
       <circle cx="8" cy="8" r="7" mask="url(#plus-mask)"/>
     </g>
 
+    <g id="removepage-shape">
+      <circle cx="8" cy="8" r="7" mask="url(#minus-mask)"/>
+    </g>
+
   </defs>
 
   <use id="addpage"                 xlink:href="#addpage-shape"/>
   <use id="addpage-hover"           xlink:href="#addpage-shape"/>
   <use id="addpage-active"          xlink:href="#addpage-shape"/>
 
-  <use id="alreadyadded"            xlink:href="#addpage-shape"/>
-  <use id="alreadyadded-hover"      xlink:href="#addpage-shape"/>
-  <use id="alreadyadded-active"     xlink:href="#addpage-shape"/>
+  <use id="alreadyadded"            xlink:href="#removepage-shape"/>
+  <use id="alreadyadded-hover"      xlink:href="#removepage-shape"/>
+  <use id="alreadyadded-active"     xlink:href="#removepage-shape"/>
 
 </svg>
diff --git a/browser/themes/shared/readinglist.inc.css b/browser/themes/shared/readinglist/readinglist.inc.css
similarity index 85%
rename from browser/themes/shared/readinglist.inc.css
rename to browser/themes/shared/readinglist/readinglist.inc.css
index 6bdf848a3188..7106352764a9 100644
--- a/browser/themes/shared/readinglist.inc.css
+++ b/browser/themes/shared/readinglist/readinglist.inc.css
@@ -1,5 +1,9 @@
 /* Reading List button */
 
+#urlbar:not([focused]):not(:hover) #readinglist-addremove-button {
+  display: none;
+}
+
 #readinglist-addremove-button {
   -moz-appearance: none;
   border: none;
@@ -16,11 +20,11 @@
   height: 16px
 }
 
-#readinglist-addremove-button:not([already-added="true"]):hover {
+#readinglist-addremove-button:hover {
   list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover");
 }
 
-#readinglist-addremove-button:not([already-added="true"]):active {
+#readinglist-addremove-button:active {
   list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active");
 }
 
@@ -35,4 +39,3 @@
 #readinglist-addremove-button[already-added="true"]:active {
   list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active");
 }
-
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 3452ff91e37e..b02f0a5974c8 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1576,7 +1576,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
-%include ../shared/readinglist.inc.css
+%include ../shared/readinglist/readinglist.inc.css
 
 /* Reader mode button */
 

From 4ba58a55edf4f23a5128137991eb7cd0983fa2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 19 Mar 2015 15:50:23 -0700
Subject: [PATCH 03/80] Bug 1144680 - The Reading List URLbar button should
 handle about:reader urls and filter out other non-http(s) urls, r=markh.

---
 browser/base/content/browser-readinglist.js   | 27 ++++++++++++++++---
 .../components/readinglist/ReadingList.jsm    |  8 +++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/browser/base/content/browser-readinglist.js b/browser/base/content/browser-readinglist.js
index 851fef307cb9..b3cda23a73ce 100644
--- a/browser/base/content/browser-readinglist.js
+++ b/browser/base/content/browser-readinglist.js
@@ -232,12 +232,22 @@ let ReadingListUI = {
       // nothing to do if we have no button.
       return;
     }
-    if (!this.enabled || state == "invalid") {
+
+    let uri;
+    if (this.enabled && state == "valid") {
+      uri = gBrowser.currentURI;
+      if (uri.schemeIs("about"))
+        uri = ReaderParent.parseReaderUrl(uri.spec);
+      else if (!uri.schemeIs("http") && !uri.schemeIs("https"))
+        uri = null;
+    }
+
+    if (!uri) {
       this.toolbarButton.setAttribute("hidden", true);
       return;
     }
 
-    let isInList = yield ReadingList.containsURL(gBrowser.currentURI);
+    let isInList = yield ReadingList.containsURL(uri);
     this.setToolbarButtonState(isInList);
   }),
 
@@ -268,11 +278,17 @@ let ReadingListUI = {
    * @returns {Promise} Promise resolved when operation has completed.
    */
   togglePageByBrowser: Task.async(function* (browser) {
-    let item = yield ReadingList.getItemForURL(browser.currentURI);
+    let uri = browser.currentURI;
+    if (uri.spec.startsWith("about:reader?"))
+      uri = ReaderParent.parseReaderUrl(uri.spec);
+    if (!uri)
+      return;
+
+    let item = yield ReadingList.getItemForURL(uri);
     if (item) {
       yield item.delete();
     } else {
-      yield ReadingList.addItemFromBrowser(browser);
+      yield ReadingList.addItemFromBrowser(browser, uri);
     }
   }),
 
@@ -284,6 +300,9 @@ let ReadingListUI = {
    */
   isItemForCurrentBrowser(item) {
     let currentURL = gBrowser.currentURI.spec;
+    if (currentURL.startsWith("about:reader?"))
+      currentURL = ReaderParent.parseReaderUrl(currentURL);
+
     if (item.url == currentURL || item.resolvedURL == currentURL) {
       return true;
     }
diff --git a/browser/components/readinglist/ReadingList.jsm b/browser/components/readinglist/ReadingList.jsm
index ed2de5eb214c..9b6c785ebd74 100644
--- a/browser/components/readinglist/ReadingList.jsm
+++ b/browser/components/readinglist/ReadingList.jsm
@@ -289,13 +289,15 @@ ReadingListImpl.prototype = {
    /**
    * Add to the ReadingList the page that is loaded in a given browser.
    *
-   * @param {<xul:browser>} browser - Browser element for the document.
+   * @param {<xul:browser>} browser - Browser element for the document,
+   * used to get metadata about the article.
+   * @param {nsIURI/string} url - url to add to the reading list.
    * @return {Promise} Promise that is fullfilled with the added item.
    */
-  addItemFromBrowser: Task.async(function* (browser) {
+  addItemFromBrowser: Task.async(function* (browser, url) {
     let metadata = yield getMetadataFromBrowser(browser);
     let itemData = {
-      url: browser.currentURI,
+      url: url,
       title: metadata.title,
       resolvedURL: metadata.url,
       excerpt: metadata.description,

From ad54999ad089fa7322b7fa53cc25df3fcb4040de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 19 Mar 2015 15:50:23 -0700
Subject: [PATCH 04/80] Bug 1145372 - The add to reading list url bar button is
 larger than the other url bar buttons, r=markh.

---
 browser/themes/linux/browser.css                      | 4 ++++
 browser/themes/osx/browser.css                        | 6 ++++++
 browser/themes/shared/readinglist/readinglist.inc.css | 5 ++---
 browser/themes/windows/browser.css                    | 4 ++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 40d21867ffd5..98b1136f1e59 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1630,6 +1630,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 %include ../shared/readinglist/readinglist.inc.css
 
+#readinglist-addremove-button {
+  padding: 0 2px;
+}
+
 /* Reader mode button */
 
 #reader-mode-button {
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 237edea7da95..b205a4098b71 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2529,6 +2529,12 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 %include ../shared/readinglist/readinglist.inc.css
 
+#readinglist-addremove-button {
+  padding: 3px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 1px;
+}
+
 /* Reader mode button */
 
 #reader-mode-button {
diff --git a/browser/themes/shared/readinglist/readinglist.inc.css b/browser/themes/shared/readinglist/readinglist.inc.css
index 7106352764a9..7840964a6b3b 100644
--- a/browser/themes/shared/readinglist/readinglist.inc.css
+++ b/browser/themes/shared/readinglist/readinglist.inc.css
@@ -8,7 +8,6 @@
   -moz-appearance: none;
   border: none;
   list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage");
-  padding: 3px;
 }
 
 #readinglist-addremove-button:hover {
@@ -16,8 +15,8 @@
 }
 
 #readinglist-addremove-button > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px
+  width: 14px;
+  height: 14px
 }
 
 #readinglist-addremove-button:hover {
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index b02f0a5974c8..098e01d02cc6 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1578,6 +1578,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 %include ../shared/readinglist/readinglist.inc.css
 
+#readinglist-addremove-button {
+  padding: 0 2px;
+}
+
 /* Reader mode button */
 
 #reader-mode-button {

From ec5d5452f9c9ee50b1b23404df56a91894038dba Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 19 Mar 2015 15:50:38 -0700
Subject: [PATCH 05/80] Bug 1133429 - [ReadingList] Store image URL in the
 ReadingList sqlite database. r=markh, a=KWierso.

---
 browser/components/readinglist/ReadingList.jsm | 9 +++------
 browser/components/readinglist/SQLiteStore.jsm | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/browser/components/readinglist/ReadingList.jsm b/browser/components/readinglist/ReadingList.jsm
index 9b6c785ebd74..259be3c795c9 100644
--- a/browser/components/readinglist/ReadingList.jsm
+++ b/browser/components/readinglist/ReadingList.jsm
@@ -42,6 +42,7 @@ const ITEM_BASIC_PROPERTY_NAMES = `
   resolvedURL
   resolvedTitle
   excerpt
+  preview
   status
   favorite
   isArticle
@@ -303,12 +304,8 @@ ReadingListImpl.prototype = {
       excerpt: metadata.description,
     };
 
-    if (metadata.description) {
-      itemData.exerpt = metadata.description;
-    }
-
     if (metadata.previews.length > 0) {
-      itemData.image = metadata.previews[0];
+      itemData.preview = metadata.previews[0];
     }
 
     let item = yield ReadingList.addItem(itemData);
@@ -918,7 +915,7 @@ function getMetadataFromBrowser(browser) {
 Object.defineProperty(this, "ReadingList", {
   get() {
     if (!this._singleton) {
-      let store = new SQLiteStore("reading-list-temp.sqlite");
+      let store = new SQLiteStore("reading-list-temp2.sqlite");
       this._singleton = new ReadingListImpl(store);
     }
     return this._singleton;
diff --git a/browser/components/readinglist/SQLiteStore.jsm b/browser/components/readinglist/SQLiteStore.jsm
index 8777aa9ee72f..645bd21412cd 100644
--- a/browser/components/readinglist/SQLiteStore.jsm
+++ b/browser/components/readinglist/SQLiteStore.jsm
@@ -204,7 +204,8 @@ this.SQLiteStore.prototype = {
         storedOn INTEGER,
         markedReadBy TEXT,
         markedReadOn INTEGER,
-        readPosition INTEGER
+        readPosition INTEGER,
+        preview TEXT
       );
     `);
     yield conn.execute(`

From 2216b53c84cd858edd839f2f24725f510c9bbf5d Mon Sep 17 00:00:00 2001
From: Manraj Singh <manrajsinghgrover@gmail.com>
Date: Thu, 19 Mar 2015 20:23:56 -0300
Subject: [PATCH 06/80] Bug 1120408 - Show TelemetryLog in about:telemetry.
 r=felipe,gfritzsche

---
 toolkit/content/aboutTelemetry.js             | 55 +++++++++++++++++++
 toolkit/content/aboutTelemetry.xhtml          |  9 +++
 .../en-US/chrome/global/aboutTelemetry.dtd    |  4 ++
 .../chrome/global/aboutTelemetry.properties   |  8 +++
 4 files changed, 76 insertions(+)

diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
index 87ac04d3fd85..90620ae49d79 100644
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -12,6 +12,7 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/TelemetryTimestamps.jsm");
 Cu.import("resource://gre/modules/TelemetryPing.jsm");
 Cu.import("resource://gre/modules/TelemetrySession.jsm");
+Cu.import("resource://gre/modules/TelemetryLog.jsm");
 
 const Telemetry = Services.telemetry;
 const bundle = Services.strings.createBundle(
@@ -152,6 +153,57 @@ let GeneralData = {
   },
 };
 
+let TelLog = {
+  /**
+   * Renders the telemetry log
+   */
+  render: function() {
+    let entries =  TelemetryLog.entries();
+
+    if(entries.length == 0) {
+        return;
+    }
+    setHasData("telemetry-log-section", true);
+    let table = document.createElement("table");
+
+    let caption = document.createElement("caption");
+    let captionString = bundle.GetStringFromName("telemetryLogTitle");
+    caption.appendChild(document.createTextNode(captionString + "\n"));
+    table.appendChild(caption);
+
+    let headings = document.createElement("tr");
+    this.appendColumn(headings, "th", bundle.GetStringFromName("telemetryLogHeadingId") + "\t");
+    this.appendColumn(headings, "th", bundle.GetStringFromName("telemetryLogHeadingTimestamp") + "\t");
+    this.appendColumn(headings, "th", bundle.GetStringFromName("telemetryLogHeadingData") + "\t");
+    table.appendChild(headings);
+
+    for (let entry of entries) {
+        let row = document.createElement("tr");
+        for (let elem of entry) {
+            this.appendColumn(row, "td", elem + "\t");
+        }
+        table.appendChild(row);
+    }
+
+    let dataDiv = document.getElementById("telemetry-log");
+    dataDiv.appendChild(table);
+  },
+
+  /**
+   * Helper function for appending a column to the data table.
+   *
+   * @param aRowElement Parent row element
+   * @param aColType Column's tag name
+   * @param aColText Column contents
+   */
+  appendColumn: function(aRowElement, aColType, aColText) {
+    let colElement = document.createElement(aColType);
+    let colTextElement = document.createTextNode(aColText);
+    colElement.appendChild(colTextElement);
+    aRowElement.appendChild(colElement);
+  },
+};
+
 let SlowSQL = {
 
   slowSqlHits: bundle.GetStringFromName("slowSqlHits"),
@@ -993,6 +1045,9 @@ function onLoad() {
   // Show general data.
   GeneralData.render();
 
+  // Show telemetry log.
+  TelLog.render();
+
   // Show slow SQL stats
   SlowSQL.render();
 
diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml
index 2c97312c1306..be9f64f9b1bf 100644
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -44,6 +44,15 @@
       </div>
     </section>
 
+    <section id="telemetry-log-section" class="data-section">
+      <input type="checkbox" class="statebox"/>
+      <h1 class="section-name">&aboutTelemetry.telemetryLogSection;</h1>
+      <span class="toggle-caption">&aboutTelemetry.toggle;</span>
+      <span class="empty-caption">&aboutTelemetry.emptySection;</span>
+      <div id="telemetry-log" class="data">
+      </div>
+    </section>
+
     <section id="slow-sql-section" class="data-section">
       <input type="checkbox" class="statebox"/>
       <h1 class="section-name">&aboutTelemetry.slowSqlSection;</h1>
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
index 78ed6d21076e..843501055854 100644
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
@@ -16,6 +16,10 @@
   General Data
 ">
 
+<!ENTITY aboutTelemetry.telemetryLogSection "
+  Telemetry Log
+">
+
 <!ENTITY aboutTelemetry.slowSqlSection "
   Slow SQL Statements
 ">
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
index 1604a1ba982b..90dff432035e 100644
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -13,6 +13,14 @@ generalDataHeadingName = Name
 
 generalDataHeadingValue = Value
 
+telemetryLogTitle = Telemetry Log
+
+telemetryLogHeadingId = Id
+
+telemetryLogHeadingTimestamp = Timestamp
+
+telemetryLogHeadingData = Data
+
 slowSqlMain = Slow SQL Statements on Main Thread
 
 slowSqlOther = Slow SQL Statements on Helper Threads

From 5e4ea3a14defd541a4874a9d682dbdfbf39561f3 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Thu, 19 Mar 2015 20:24:08 -0300
Subject: [PATCH 07/80] Bug 1143263 - WebApp Runtime makes Mac always use
 discrete graphics card. r=mstange

---
 toolkit/webapps/MacNativeApp.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolkit/webapps/MacNativeApp.js b/toolkit/webapps/MacNativeApp.js
index dadd6c43ed45..9748c0e80352 100644
--- a/toolkit/webapps/MacNativeApp.js
+++ b/toolkit/webapps/MacNativeApp.js
@@ -269,6 +269,8 @@ NativeApp.prototype = {
     <string>0</string>\n\
     <key>NSHighResolutionCapable</key>\n\
     <true/>\n\
+    <key>NSSupportsAutomaticGraphicsSwitching</key>\n\
+    <true/>\n\
     <key>NSPrincipalClass</key>\n\
     <string>GeckoNSApplication</string>\n\
     <key>FirefoxBinary</key>\n\

From f333ec2ca3b3a7a3f9b605a0a695e34e975954cb Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Thu, 19 Mar 2015 16:43:29 -0700
Subject: [PATCH 08/80] Bug 1081450 - Copy maintenance service binary into its
 install directory on Windows 8 when the installed binary is different.
 r=bbondy

---
 .../update/tests/data/xpcshellUtilsAUS.js     | 36 ++++---------------
 .../marStageSuccessCompleteSvc.js             |  2 +-
 .../marStageSuccessPartialSvc.js              |  2 +-
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
index e0ed738b554f..465b3fc4b7e2 100644
--- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
+++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
@@ -1572,15 +1572,9 @@ function stageUpdate() {
  *
  * @param  aFirstTest
  *         Whether this is the first test within the test.
- * @param  aSkipTest
- *         Whether to skip this test if the installed maintenance service
- *         isn't the same as the build's maintenance service. This is a
- *         temporary workaround until all build systems grant write access to
- *         the maintenance service install directory so the tests can copy the
- *         version of the maintenance service that should be tests.
  * @return true if the test should run and false if it shouldn't.
  */
-function shouldRunServiceTest(aFirstTest, aSkipTest) {
+function shouldRunServiceTest(aFirstTest) {
   let binDir = getGREBinDir();
   let updaterBin = binDir.clone();
   updaterBin.append(FILE_UPDATER_BIN);
@@ -1646,7 +1640,7 @@ function shouldRunServiceTest(aFirstTest, aSkipTest) {
   // In case the machine is running an old maintenance service or if it
   // is not installed, and permissions exist to install it. Then install
   // the newer bin that we have since all of the other checks passed.
-  return attemptServiceInstall(aSkipTest);
+  return attemptServiceInstall();
 }
 
 /**
@@ -1854,15 +1848,8 @@ function copyFileToTestAppDir(aFileRelPath, aInGreDir) {
  * This is useful for XP where we have permission to upgrade in case an
  * older service installer exists.  Also if the user manually installed into
  * a unprivileged location.
- *
- * @param  aSkipTest
- *         Whether to skip this test if the installed maintenance service
- *         isn't the same as the build's maintenance service. This is a
- *         temporary workaround until all build systems grant write access to
- *         the maintenance service install directory so the tests can copy the
- *         version of the maintenance service that should be tests.
  */
-function attemptServiceInstall(aSkipTest) {
+function attemptServiceInstall() {
   const CSIDL_PROGRAM_FILES = 0x26;
   const CSIDL_PROGRAM_FILESX86 = 0x2A;
   // This will return an empty string on our Win XP build systems.
@@ -1905,7 +1892,6 @@ function attemptServiceInstall(aSkipTest) {
     oldMaintSvcBin.moveTo(maintSvcDir, FILE_MAINTENANCE_SERVICE_BIN + ".backup");
     buildMaintSvcBin.copyTo(maintSvcDir, FILE_MAINTENANCE_SERVICE_BIN);
     backupMaintSvcBin.remove(false);
-    return true;
   } catch (e) {
     // Restore the original file in case the moveTo was successful.
     if (backupMaintSvcBin.exists()) {
@@ -1918,21 +1904,11 @@ function attemptServiceInstall(aSkipTest) {
     logTestInfo("unable to copy new maintenance service into the " +
                 "maintenance service directory: " + maintSvcDir.path + ", " +
                 "Exception: " + e);
+    do_throw("The account running the tests on the build systems should have " +
+             "write access to the maintenance service directory!");
   }
 
-  let version = Cc["@mozilla.org/system-info;1"].
-                getService(Ci.nsIPropertyBag2).
-                getProperty("version");
-  // The account running the tests on Win XP and Win 7 build systems have write
-  // access to the maintenance service directory so throw if copying the
-  // maintenance service binary fails. This should always throw after write
-  // access is provided on all Windows build slaves in bug 1067756.
-  if ((parseFloat(version) <= 6.1)) {
-    do_throw("The account running the tests on Win 7 and below build systems " +
-             "should have write access to the maintenance service directory!");
-  }
-
-  return aSkipTest ? false : true;
+  return true;
 }
 
 /**
diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js
index 4f9610f26ecc..19dc39d67c77 100644
--- a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js
+++ b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessCompleteSvc.js
@@ -6,7 +6,7 @@
 /* General Complete MAR File Staged Patch Apply Test */
 
 function run_test() {
-  if (!shouldRunServiceTest(false, true)) {
+  if (!shouldRunServiceTest()) {
     return;
   }
 
diff --git a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js
index a5af13db3ecb..110384831b23 100644
--- a/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js
+++ b/toolkit/mozapps/update/tests/unit_service_updater/marStageSuccessPartialSvc.js
@@ -9,7 +9,7 @@ function run_test() {
   // Set to true due to bug 1083653
   DEBUG_AUS_TEST = true;
 
-  if (!shouldRunServiceTest(false, true)) {
+  if (!shouldRunServiceTest()) {
     return;
   }
 

From 9d06161cb9123b6ca4a5752a161a8cbc7266d399 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Wed, 11 Mar 2015 11:40:29 -0700
Subject: [PATCH 09/80] Bug 1131004 - Provide a more detailed description for
 pre-installed OpenH264 add-on. r=gfritzsche

--HG--
extra : rebase_source : 9eb6390b093db42e82ccfdde2327aecc90dfd71d
---
 dom/locales/en-US/chrome/plugins.properties         | 2 +-
 toolkit/mozapps/extensions/internal/GMPProvider.jsm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/locales/en-US/chrome/plugins.properties b/dom/locales/en-US/chrome/plugins.properties
index df1df4a592f0..124768018d78 100644
--- a/dom/locales/en-US/chrome/plugins.properties
+++ b/dom/locales/en-US/chrome/plugins.properties
@@ -25,7 +25,7 @@ learn_more_label=Learn More
 gmp_license_info=License information
 
 openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
-openH264_description=Play back web video and use video chats.
+openH264_description2=This plugin is automatically installed by Mozilla to comply with the WebRTC specification and to enable WebRTC calls with devices that require the H.264 video codec. Visit http://www.openh264.org/ to view the codec source code and learn more about the implementation.
 
 eme-adobe_name=Primetime Content Decryption Module provided by Adobe Systems, Incorporated
 eme-adobe_description=Play back protected web video.
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 2bc7b778cc87..a21964d6a737 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -52,7 +52,7 @@ const GMP_PLUGINS = [
   {
     id:              "gmp-gmpopenh264",
     name:            "openH264_name",
-    description:     "openH264_description",
+    description:     "openH264_description2",
     // The following licenseURL is part of an awful hack to include the OpenH264
     // license without having bug 624602 fixed yet, and intentionally ignores
     // localisation.

From c0ede94dd61a142cf130461b5f12b4d7ebe735ee Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Wed, 18 Mar 2015 13:42:52 -0700
Subject: [PATCH 10/80] Bug 1143844 - Check document for readerable content to
 determine whether or not to show reader button. r=Gijs

--HG--
extra : rebase_source : 7a849952243aa5ff8d4711a1f0308747558faa2f
---
 toolkit/components/reader/ReaderMode.jsm | 37 ++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
index dc1f01e37177..0ebbb80d26f4 100644
--- a/toolkit/components/reader/ReaderMode.jsm
+++ b/toolkit/components/reader/ReaderMode.jsm
@@ -63,14 +63,47 @@ this.ReaderMode = {
 
   /**
    * Decides whether or not a document is reader-able without parsing the whole thing.
-   * XXX: In the future, this should be smarter (bug 1143844).
    *
    * @param doc A document to parse.
    * @return boolean Whether or not we should show the reader mode button.
    */
   isProbablyReaderable: function(doc) {
     let uri = Services.io.newURI(doc.documentURI, null, null);
-    return this._shouldCheckUri(uri);
+
+    if (!this._shouldCheckUri(uri)) {
+      return false;
+    }
+
+    let REGEXPS = {
+      unlikelyCandidates: /combx|comment|community|disqus|extra|foot|header|menu|remark|rss|shoutbox|sidebar|sponsor|ad-break|agegate|pagination|pager|popup|tweet|twitter/i,
+      okMaybeItsACandidate: /and|article|body|column|main|shadow/i,
+    };
+
+    let nodes = doc.getElementsByTagName("p");
+    if (nodes.length < 5) {
+      return false;
+    }
+
+    let possibleParagraphs = 0;
+    for (let i = 0; i < nodes.length; i++) {
+      let node = nodes[i];
+      let matchString = node.className + " " + node.id;
+
+      if (REGEXPS.unlikelyCandidates.test(matchString) &&
+          !REGEXPS.okMaybeItsACandidate.test(matchString)) {
+        continue;
+      }
+
+      if (node.textContent.trim().length < 200) {
+        continue;
+      }
+
+      possibleParagraphs++;
+      if (possibleParagraphs >= 5) {
+        return true;
+      }
+    }
+    return false;
   },
 
   /**

From a1c1a80388dc8f49029569611dfda19b8816cc92 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 19 Mar 2015 13:17:01 -0700
Subject: [PATCH 11/80] Bug 1143844 - Update readerModeArticle.html test case
 to have more paragrpahs. r=Gijs

--HG--
extra : rebase_source : 01d361f432ac4189274da01de61538a99761c225
---
 browser/base/content/test/general/readerModeArticle.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/base/content/test/general/readerModeArticle.html b/browser/base/content/test/general/readerModeArticle.html
index f34cbece4e18..b533423ad66f 100644
--- a/browser/base/content/test/general/readerModeArticle.html
+++ b/browser/base/content/test/general/readerModeArticle.html
@@ -11,6 +11,9 @@
 <h2 class="author">by Jane Doe</h2>
 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.</p>
 <p>Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenatis pulvinar tellus gravida ornare. Sed et erat faucibus nunc euismod ultricies ut id justo. Nullam cursus suscipit nisi, et ultrices justo sodales nec. Fusce venenatis facilisis lectus ac semper. Aliquam at massa ipsum. Quisque bibendum purus convallis nulla ultrices ultricies. Nullam aliquam, mi eu aliquam tincidunt, purus velit laoreet tortor, viverra pretium nisi quam vitae mi. Fusce vel volutpat elit. Nam sagittis nisi dui.</p>
+<p>Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenatis pulvinar tellus gravida ornare. Sed et erat faucibus nunc euismod ultricies ut id justo. Nullam cursus suscipit nisi, et ultrices justo sodales nec. Fusce venenatis facilisis lectus ac semper. Aliquam at massa ipsum. Quisque bibendum purus convallis nulla ultrices ultricies. Nullam aliquam, mi eu aliquam tincidunt, purus velit laoreet tortor, viverra pretium nisi quam vitae mi. Fusce vel volutpat elit. Nam sagittis nisi dui.</p>
+<p>Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenatis pulvinar tellus gravida ornare. Sed et erat faucibus nunc euismod ultricies ut id justo. Nullam cursus suscipit nisi, et ultrices justo sodales nec. Fusce venenatis facilisis lectus ac semper. Aliquam at massa ipsum. Quisque bibendum purus convallis nulla ultrices ultricies. Nullam aliquam, mi eu aliquam tincidunt, purus velit laoreet tortor, viverra pretium nisi quam vitae mi. Fusce vel volutpat elit. Nam sagittis nisi dui.</p>
+<p>Vivamus fermentum semper porta. Nunc diam velit, adipiscing ut tristique vitae, sagittis vel odio. Maecenas convallis ullamcorper ultricies. Curabitur ornare, ligula semper consectetur sagittis, nisi diam iaculis velit, id fringilla sem nunc vel mi. Nam dictum, odio nec pretium volutpat, arcu ante placerat erat, non tristique elit urna et turpis. Quisque mi metus, ornare sit amet fermentum et, tincidunt et orci. Fusce eget orci a orci congue vestibulum. Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenatis pulvinar tellus gravida ornare. Sed et erat faucibus nunc euismod ultricies ut id justo. Nullam cursus suscipit nisi, et ultrices justo sodales nec. Fusce venenatis facilisis lectus ac semper. Aliquam at massa ipsum. Quisque bibendum purus convallis nulla ultrices ultricies. Nullam aliquam, mi eu aliquam tincidunt, purus velit laoreet tortor, viverra pretium nisi quam vitae mi. Fusce vel volutpat elit. Nam sagittis nisi dui.</p>
 </div>
 </body>
 </html>

From 4af71575a2cbbf0149c66d1aa8a3c3da0340bec2 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Thu, 19 Mar 2015 11:44:07 -0700
Subject: [PATCH 12/80] Bug 1145259 - Add pageshow listener to check whether or
 not to show reader button when DOMContentLoaded doesn't fire. r=Gijs

--HG--
extra : rebase_source : dc5b48a3fb01aa54d9c138deb1471370c35cd6c8
---
 browser/base/content/content.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index a82c4a1767b8..529be00a7d2d 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -486,6 +486,7 @@ let AboutReaderListener = {
   init: function() {
     addEventListener("AboutReaderContentLoaded", this, false, true);
     addEventListener("DOMContentLoaded", this, false);
+    addEventListener("pageshow", this, false);
     addEventListener("pagehide", this, false);
     addMessageListener("Reader:ParseDocument", this);
   },
@@ -525,6 +526,13 @@ let AboutReaderListener = {
         sendAsyncMessage("Reader:UpdateReaderButton", { isArticle: false });
         break;
 
+      case "pageshow":
+        // If a page is loaded from the bfcache, we won't get a "DOMContentLoaded"
+        // event, so we need to rely on "pageshow" in this case.
+        if (!aEvent.persisted) {
+          break;
+        }
+        // Fall through.
       case "DOMContentLoaded":
         if (!ReaderMode.isEnabledForParseOnLoad || this.isAboutReader) {
           return;

From 9fca7ec964778653955919f5d23df298119d1c19 Mon Sep 17 00:00:00 2001
From: Stephen Pohl <spohl.mozilla.bugs@gmail.com>
Date: Thu, 19 Mar 2015 22:59:38 -0400
Subject: [PATCH 13/80] Bug 1140263: Enable Adobe EME on Windows Vista+ and add
 a pref to force-enable it on other platforms. r=mossop

---
 modules/libpref/init/all.js                   |   3 -
 toolkit/modules/GMPInstallManager.jsm         | 109 ++--------
 toolkit/modules/GMPUtils.jsm                  | 157 ++++++++++++++
 toolkit/modules/moz.build                     |   1 +
 .../extensions/internal/GMPProvider.jsm       | 202 +++++++-----------
 5 files changed, 251 insertions(+), 221 deletions(-)
 create mode 100644 toolkit/modules/GMPUtils.jsm

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 57934ca0af65..062c5f04dd18 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4585,9 +4585,6 @@ pref("media.gmp-manager.certs.1.issuerName", "CN=DigiCert Secure Server CA,O=Dig
 pref("media.gmp-manager.certs.1.commonName", "aus4.mozilla.org");
 pref("media.gmp-manager.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US");
 pref("media.gmp-manager.certs.2.commonName", "aus4.mozilla.org");
-
-// Adobe EME is currently pref'd off by default and hidden in the addon manager.
-pref("media.gmp-eme-adobe.hidden", true);
 #endif
 
 // Whether or not to perform reader mode article parsing on page load.
diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
index d61bc1c46751..74edfe9c7657 100644
--- a/toolkit/modules/GMPInstallManager.jsm
+++ b/toolkit/modules/GMPInstallManager.jsm
@@ -15,15 +15,6 @@ const DOWNLOAD_INTERVAL  = 0;
 // 1 day default
 const DEFAULT_SECONDS_BETWEEN_CHECKS = 60 * 60 * 24;
 
-// Global pref to enable/disable all EME plugins
-const EME_ENABLED = "media.eme.enabled";
-
-
-// GMP IDs
-const OPEN_H264_ID = "gmp-gmpopenh264";
-const EME_ADOBE_ID = "gmp-eme-adobe";
-const GMP_ADDONS = [ OPEN_H264_ID, EME_ADOBE_ID ];
-
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
@@ -33,9 +24,10 @@ Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
+Cu.import("resource://gre/modules/GMPUtils.jsm");
 
 this.EXPORTED_SYMBOLS = ["GMPInstallManager", "GMPExtractor", "GMPDownloader",
-                         "GMPAddon", "GMPPrefs", "OPEN_H264_ID"];
+                         "GMPAddon"];
 
 var gLocale = null;
 
@@ -65,68 +57,6 @@ function getScopedLogger(prefix) {
   return Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP", prefix + " ");
 }
 
-/**
- * Manages preferences for GMP addons
- */
-let GMPPrefs = {
-  /**
-   * Obtains the specified preference in relation to the specified addon
-   * @param key The GMPPrefs key value to use
-   * @param defaultValue The default value if no preference exists
-   * @param addon The addon to scope the preference to
-   * @return The obtained preference value, or the defaultValue if none exists
-   */
-  get: function(key, defaultValue, addon) {
-    if (key === GMPPrefs.KEY_APP_DISTRIBUTION ||
-        key === GMPPrefs.KEY_APP_DISTRIBUTION_VERSION) {
-      let prefValue = "default";
-      try {
-        prefValue = Services.prefs.getDefaultBranch(null).getCharPref(key);
-      } catch (e) {
-        // use default when pref not found
-      }
-      return prefValue;
-    }
-
-    return Preferences.get(this._getPrefKey(key, addon), defaultValue);
-  },
-  /**
-   * Sets the specified preference in relation to the specified addon
-   * @param key The GMPPrefs key value to use
-   * @param val The value to set
-   * @param addon The addon to scope the preference to
-   */
-  set: function(key, val, addon) {
-    let log = getScopedLogger("GMPInstallManager.jsm GMPPrefs.set");
-    log.info("Setting pref: " + this._getPrefKey(key, addon) +
-             " to value: " + val);
-    return Preferences.set(this._getPrefKey(key, addon), val);
-  },
-  _getPrefKey: function(key, addon) {
-    return  key.replace("{0}", addon || "");
-  },
-
-  /**
-   * List of keys which can be used in get and set
-   */
-  KEY_ADDON_ENABLED: "media.{0}.enabled",
-  KEY_ADDON_LAST_UPDATE: "media.{0}.lastUpdate",
-  KEY_ADDON_VERSION: "media.{0}.version",
-  KEY_ADDON_AUTOUPDATE: "media.{0}.autoupdate",
-  KEY_ADDON_HIDDEN: "media.{0}.hidden",
-  KEY_URL: "media.gmp-manager.url",
-  KEY_URL_OVERRIDE: "media.gmp-manager.url.override",
-  KEY_CERT_CHECKATTRS: "media.gmp-manager.cert.checkAttributes",
-  KEY_CERT_REQUIREBUILTIN: "media.gmp-manager.cert.requireBuiltIn",
-  KEY_UPDATE_LAST_CHECK: "media.gmp-manager.lastCheck",
-  KEY_UPDATE_SECONDS_BETWEEN_CHECKS: "media.gmp-manager.secondsBetweenChecks",
-  KEY_APP_DISTRIBUTION: "distribution.id",
-  KEY_APP_DISTRIBUTION_VERSION: "distribution.version",
-  KEY_BUILDID: "media.gmp-manager.buildID",
-
-  CERTS_BRANCH: "media.gmp-manager.certs."
-};
-
 // This is copied directly from nsUpdateService.js
 // It is used for calculating the URL string w/ var replacement.
 // TODO: refactor this out somewhere else
@@ -417,11 +347,11 @@ GMPInstallManager.prototype = {
     return now - lastCheck;
   },
   get _isEMEEnabled() {
-    return Preferences.get(EME_ENABLED, true);
+    return GMPPrefs.get(GMPPrefs.KEY_EME_ENABLED, true);
   },
   _isAddonUpdateEnabled: function(aAddon) {
-    return GMPPrefs.get(GMPPrefs.KEY_ADDON_ENABLED, true, aAddon) &&
-           GMPPrefs.get(GMPPrefs.KEY_ADDON_AUTOUPDATE, true, aAddon);
+    return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_ENABLED, true, aAddon) &&
+           GMPPrefs.get(GMPPrefs.KEY_PLUGIN_AUTOUPDATE, true, aAddon);
   },
   _updateLastCheck: function() {
     let now = Math.round(Date.now() / 1000);
@@ -452,7 +382,7 @@ GMPInstallManager.prototype = {
                "new or updated GMPs.");
     } else {
       let secondsBetweenChecks =
-        GMPPrefs.get(GMPPrefs.KEY_UPDATE_SECONDS_BETWEEN_CHECKS,
+        GMPPrefs.get(GMPPrefs.KEY_SECONDS_BETWEEN_CHECKS,
                      DEFAULT_SECONDS_BETWEEN_CHECKS)
       let secondsSinceLast = this._getTimeSinceLastCheck();
       log.info("Last check was: " + secondsSinceLast +
@@ -470,19 +400,14 @@ GMPInstallManager.prototype = {
       let addonsToInstall = gmpAddons.filter(function(gmpAddon) {
         log.info("Found addon: " + gmpAddon.toString());
 
-        if (gmpAddon.isHidden || !gmpAddon.isValid || gmpAddon.isInstalled) {
-          log.info("Addon hidden, invalid or already installed.");
-          return false;
-        }
-
-        // We're dealing with an EME GMP if the id starts with "gmp-eme-".
-        if (gmpAddon.id.indexOf("gmp-eme-") == 0 && !this._isEMEEnabled) {
-          log.info("Auto-update is off for all EME plugins, skipping check.");
+        if (!gmpAddon.isValid || GMPUtils.isPluginHidden(gmpAddon) ||
+            gmpAddon.isInstalled) {
+          log.info("Addon invalid, hidden or already installed.");
           return false;
         }
 
         let addonUpdateEnabled = false;
-        if (GMP_ADDONS.indexOf(gmpAddon.id) >= 0) {
+        if (GMP_PLUGIN_IDS.indexOf(gmpAddon.id) >= 0) {
           addonUpdateEnabled = this._isAddonUpdateEnabled(gmpAddon.id);
           if (!addonUpdateEnabled) {
             log.info("Auto-update is off for " + gmpAddon.id +
@@ -564,7 +489,7 @@ GMPInstallManager.prototype = {
       let certs = null;
       if (!Services.prefs.prefHasUserValue(GMPPrefs.KEY_URL_OVERRIDE) &&
           GMPPrefs.get(GMPPrefs.KEY_CERT_CHECKATTRS, true)) {
-        certs = gCertUtils.readCertPrefs(GMPPrefs.CERTS_BRANCH);
+        certs = gCertUtils.readCertPrefs(GMPPrefs.KEY_CERTS_BRANCH);
       }
 
       let allowNonBuiltIn = !GMPPrefs.get(GMPPrefs.KEY_CERT_REQUIREBUILTIN,
@@ -751,11 +676,11 @@ GMPAddon.prototype = {
   },
   get isInstalled() {
     return this.version &&
-      GMPPrefs.get(GMPPrefs.KEY_ADDON_VERSION, "", this.id) === this.version;
+      GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, "", this.id) === this.version;
+  },
+  get isEME() {
+    return this.id.indexOf("gmp-eme-") == 0;
   },
-  get isHidden() {
-    return GMPPrefs.get(GMPPrefs.KEY_ADDON_HIDDEN, false, this.id);
-  }
 };
 /**
  * Constructs a GMPExtractor object which is used to extract a GMP zip
@@ -959,10 +884,10 @@ GMPDownloader.prototype = {
       installPromise.then(extractedPaths => {
         // Success, set the prefs
         let now = Math.round(Date.now() / 1000);
-        GMPPrefs.set(GMPPrefs.KEY_ADDON_LAST_UPDATE, now, gmpAddon.id);
+        GMPPrefs.set(GMPPrefs.KEY_PLUGIN_LAST_UPDATE, now, gmpAddon.id);
         // Setting the version pref signals installation completion to consumers,
         // if you need to set other prefs etc. do it before this.
-        GMPPrefs.set(GMPPrefs.KEY_ADDON_VERSION, gmpAddon.version,
+        GMPPrefs.set(GMPPrefs.KEY_PLUGIN_VERSION, gmpAddon.version,
                      gmpAddon.id);
         this._deferred.resolve(extractedPaths);
       }, err => {
diff --git a/toolkit/modules/GMPUtils.jsm b/toolkit/modules/GMPUtils.jsm
new file mode 100644
index 000000000000..f4e6caaade7c
--- /dev/null
+++ b/toolkit/modules/GMPUtils.jsm
@@ -0,0 +1,157 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} =
+  Components;
+
+this.EXPORTED_SYMBOLS = [ "EME_ADOBE_ID",
+                          "GMP_PLUGIN_IDS",
+                          "GMPPrefs",
+                          "GMPUtils",
+                          "OPEN_H264_ID" ];
+
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+// GMP IDs
+const OPEN_H264_ID  = "gmp-gmpopenh264";
+const EME_ADOBE_ID  = "gmp-eme-adobe";
+const GMP_PLUGIN_IDS = [ OPEN_H264_ID, EME_ADOBE_ID ];
+
+this.GMPUtils = {
+  /**
+   * Checks whether or not a given plugin is hidden. Hidden plugins are neither
+   * downloaded nor displayed in the addons manager.
+   * @param   aPlugin
+   *          The plugin to check.
+   */
+  isPluginHidden: function(aPlugin) {
+    if (aPlugin.isEME) {
+      if (this._isPluginSupported(aPlugin) ||
+          this._isPluginForcedVisible(aPlugin)) {
+        return !GMPPrefs.get(GMPPrefs.KEY_EME_ENABLED, true);
+      } else {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  /**
+   * Checks whether or not a given plugin is supported by the current OS.
+   * @param   aPlugin
+   *          The plugin to check.
+   */
+  _isPluginSupported: function(aPlugin) {
+    if (aPlugin.id == EME_ADOBE_ID) {
+      if (Services.appinfo.OS == "WINNT") {
+        return Services.sysinfo.getPropertyAsInt32("version") >= 6;
+      } else {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  /**
+   * Checks whether or not a given plugin is forced visible. This can be used
+   * to test plugins that aren't yet supported by default on a particular OS.
+   * @param   aPlugin
+   *          The plugin to check.
+   */
+  _isPluginForcedVisible: function(aPlugin) {
+    return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, false, aPlugin.id);
+  },
+};
+
+/**
+ * Manages preferences for GMP addons
+ */
+this.GMPPrefs = {
+  KEY_EME_ENABLED:              "media.eme.enabled",
+  KEY_PLUGIN_ENABLED:           "media.{0}.enabled",
+  KEY_PLUGIN_LAST_UPDATE:       "media.{0}.lastUpdate",
+  KEY_PLUGIN_VERSION:           "media.{0}.version",
+  KEY_PLUGIN_AUTOUPDATE:        "media.{0}.autoupdate",
+  KEY_PLUGIN_FORCEVISIBLE:      "media.{0}.forcevisible",
+  KEY_URL:                      "media.gmp-manager.url",
+  KEY_URL_OVERRIDE:             "media.gmp-manager.url.override",
+  KEY_CERT_CHECKATTRS:          "media.gmp-manager.cert.checkAttributes",
+  KEY_CERT_REQUIREBUILTIN:      "media.gmp-manager.cert.requireBuiltIn",
+  KEY_UPDATE_LAST_CHECK:        "media.gmp-manager.lastCheck",
+  KEY_SECONDS_BETWEEN_CHECKS:   "media.gmp-manager.secondsBetweenChecks",
+  KEY_APP_DISTRIBUTION:         "distribution.id",
+  KEY_APP_DISTRIBUTION_VERSION: "distribution.version",
+  KEY_BUILDID:                  "media.gmp-manager.buildID",
+  KEY_CERTS_BRANCH:             "media.gmp-manager.certs.",
+  KEY_PROVIDER_ENABLED:         "media.gmp-provider.enabled",
+  KEY_PROVIDER_LASTCHECK:       "media.gmp-manager.lastCheck",
+  KEY_LOG_BASE:                 "media.gmp.log.",
+  KEY_LOGGING_LEVEL:            this.KEY_LOG_BASE + "level",
+  KEY_LOGGING_DUMP:             this.KEY_LOG_BASE + "dump",
+
+  /**
+   * Obtains the specified preference in relation to the specified plugin.
+   * @param aKey The preference key value to use.
+   * @param aDefaultValue The default value if no preference exists.
+   * @param aPlugin The plugin to scope the preference to.
+   * @return The obtained preference value, or the defaultValue if none exists.
+   */
+  get: function(aKey, aDefaultValue, aPlugin) {
+    if (aKey === this.KEY_APP_DISTRIBUTION ||
+        aKey === this.KEY_APP_DISTRIBUTION_VERSION) {
+      let prefValue = "default";
+      try {
+        prefValue = Services.prefs.getDefaultBranch(null).getCharPref(aKey);
+      } catch (e) {
+        // use default when pref not found
+      }
+      return prefValue;
+    }
+    return Preferences.get(this.getPrefKey(aKey, aPlugin), aDefaultValue);
+  },
+
+  /**
+   * Sets the specified preference in relation to the specified plugin.
+   * @param aKey The preference key value to use.
+   * @param aVal The value to set.
+   * @param aPlugin The plugin to scope the preference to.
+   */
+  set: function(aKey, aVal, aPlugin) {
+    Preferences.set(this.getPrefKey(aKey, aPlugin), aVal);
+  },
+
+  /**
+   * Checks whether or not the specified preference is set in relation to the
+   * specified plugin.
+   * @param aKey The preference key value to use.
+   * @param aPlugin The plugin to scope the preference to.
+   * @return true if the preference is set, false otherwise.
+   */
+  isSet: function(aKey, aPlugin) {
+    return Preferences.isSet(this.getPrefKey(aKey, aPlugin));
+  },
+
+  /**
+   * Resets the specified preference in relation to the specified plugin to its
+   * default.
+   * @param aKey The preference key value to use.
+   * @param aPlugin The plugin to scope the preference to.
+   */
+  reset: function(aKey, aPlugin) {
+    Preferences.reset(this.getPrefKey(aKey, aPlugin));
+  },
+
+  /**
+   * Scopes the specified preference key to the specified plugin.
+   * @param aKey The preference key value to use.
+   * @param aPlugin The plugin to scope the preference to.
+   * @return A preference key scoped to the specified plugin.
+   */
+  getPrefKey: function(aKey, aPlugin) {
+    return aKey.replace("{0}", aPlugin || "");
+  },
+};
\ No newline at end of file
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index b84c4784f4ee..23c1d9e5185a 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -67,6 +67,7 @@ EXTRA_JS_MODULES += [
 EXTRA_PP_JS_MODULES += [
     'CertUtils.jsm',
     'GMPInstallManager.jsm',
+    'GMPUtils.jsm',
     'ResetProfile.jsm',
     'secondscreen/RokuApp.jsm',
     'Services.jsm',
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index a21964d6a737..e7dd1688631d 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -17,6 +17,7 @@ Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/GMPUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(
   this, "GMPInstallManager", "resource://gre/modules/GMPInstallManager.jsm");
@@ -30,27 +31,12 @@ const NS_GRE_DIR             = "GreD";
 const CLEARKEY_PLUGIN_ID     = "gmp-clearkey";
 const CLEARKEY_VERSION       = "0.1";
 
-/**
- * Keys which can be used via GMPPrefs.
- */
-const KEY_PROVIDER_ENABLED   = "media.gmp-provider.enabled";
-const KEY_PROVIDER_LASTCHECK = "media.gmp-manager.lastCheck";
-const KEY_LOG_BASE           = "media.gmp.log.";
-const KEY_LOGGING_LEVEL      = KEY_LOG_BASE + "level";
-const KEY_LOGGING_DUMP       = KEY_LOG_BASE + "dump";
-const KEY_EME_ENABLED        = "media.eme.enabled"; // Global pref to enable/disable all EME plugins
-const KEY_PLUGIN_ENABLED     = "media.{0}.enabled";
-const KEY_PLUGIN_LAST_UPDATE = "media.{0}.lastUpdate";
-const KEY_PLUGIN_VERSION     = "media.{0}.version";
-const KEY_PLUGIN_AUTOUPDATE  = "media.{0}.autoupdate";
-const KEY_PLUGIN_HIDDEN      = "media.{0}.hidden";
-
 const GMP_LICENSE_INFO       = "gmp_license_info";
 const GMP_LEARN_MORE         = "learn_more_label";
 
 const GMP_PLUGINS = [
   {
-    id:              "gmp-gmpopenh264",
+    id:              OPEN_H264_ID,
     name:            "openH264_name",
     description:     "openH264_description2",
     // The following licenseURL is part of an awful hack to include the OpenH264
@@ -61,7 +47,7 @@ const GMP_PLUGINS = [
     optionsURL:      "chrome://mozapps/content/extensions/gmpPrefs.xul"
   },
   {
-    id:              "gmp-eme-adobe",
+    id:              EME_ADOBE_ID,
     name:            "eme-adobe_name",
     description:     "eme-adobe_description",
     // The following learnMoreURL is another hack to be able to support a SUMO page for this
@@ -88,9 +74,9 @@ function configureLogging() {
     gLogger = Log.repository.getLogger("Toolkit.GMP");
     gLogger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
   }
-  gLogger.level = GMPPrefs.get(KEY_LOGGING_LEVEL, Log.Level.Warn);
+  gLogger.level = GMPPrefs.get(GMPPrefs.KEY_LOGGING_LEVEL, Log.Level.Warn);
 
-  let logDumping = GMPPrefs.get(KEY_LOGGING_DUMP, false);
+  let logDumping = GMPPrefs.get(GMPPrefs.KEY_LOGGING_DUMP, false);
   if (logDumping != !!gLogAppenderDump) {
     if (logDumping) {
       gLogAppenderDump = new Log.DumpAppender(new Log.BasicFormatter());
@@ -102,64 +88,7 @@ function configureLogging() {
   }
 }
 
-/**
- * Manages preferences for GMP addons
- */
-let GMPPrefs = {
-  /**
-   * Obtains the specified preference in relation to the specified plugin.
-   * @param aKey The preference key value to use.
-   * @param aDefaultValue The default value if no preference exists.
-   * @param aPlugin The plugin to scope the preference to.
-   * @return The obtained preference value, or the defaultValue if none exists.
-   */
-  get: function(aKey, aDefaultValue, aPlugin) {
-    return Preferences.get(this.getPrefKey(aKey, aPlugin), aDefaultValue);
-  },
-  /**
-   * Sets the specified preference in relation to the specified plugin.
-   * @param aKey The preference key value to use.
-   * @param aVal The value to set.
-   * @param aPlugin The plugin to scope the preference to.
-   */
-  set: function(aKey, aVal, aPlugin) {
-    let log =
-      Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP",
-                                                "GMPProvider.jsm " +
-                                                "GMPPrefs.set ");
-    log.trace("Setting pref: " + this.getPrefKey(aKey, aPlugin) +
-             " to value: " + aVal);
-    Preferences.set(this.getPrefKey(aKey, aPlugin), aVal);
-  },
-  /**
-   * Checks whether or not the specified preference is set in relation to the
-   * specified plugin.
-   * @param aKey The preference key value to use.
-   * @param aPlugin The plugin to scope the preference to.
-   * @return true if the preference is set, false otherwise.
-   */
-  isSet: function(aKey, aPlugin) {
-    return Preferences.isSet(GMPPrefs.getPrefKey(aKey, aPlugin));
-  },
-  /**
-   * Resets the specified preference in relation to the specified plugin to its
-   * default.
-   * @param aKey The preference key value to use.
-   * @param aPlugin The plugin to scope the preference to.
-   */
-  reset: function(aKey, aPlugin) {
-    Preferences.reset(this.getPrefKey(aKey, aPlugin));
-  },
-  /**
-   * Scopes the specified preference key to the specified plugin.
-   * @param aKey The preference key value to use.
-   * @param aPlugin The plugin to scope the preference to.
-   * @return A preference key scoped to the specified plugin.
-   */
-  getPrefKey: function(aKey, aPlugin) {
-    return aKey.replace("{0}", aPlugin || "");
-  },
-};
+
 
 /**
  * The GMPWrapper provides the info for the various GMP plugins to public
@@ -171,13 +100,15 @@ function GMPWrapper(aPluginInfo) {
     Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP",
                                               "GMPWrapper(" +
                                               this._plugin.id + ") ");
-  Preferences.observe(GMPPrefs.getPrefKey(KEY_PLUGIN_ENABLED, this._plugin.id),
+  Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED,
+                                          this._plugin.id),
                       this.onPrefEnabledChanged, this);
-  Preferences.observe(GMPPrefs.getPrefKey(KEY_PLUGIN_VERSION, this._plugin.id),
+  Preferences.observe(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION,
+                                          this._plugin.id),
                       this.onPrefVersionChanged, this);
   if (this._plugin.isEME) {
-    Preferences.observe(KEY_EME_ENABLED, this.onPrefEMEGlobalEnabledChanged,
-                        this);
+    Preferences.observe(GMPPrefs.KEY_EME_ENABLED,
+                        this.onPrefEMEGlobalEnabledChanged, this);
   }
 }
 
@@ -194,8 +125,8 @@ GMPWrapper.prototype = {
     if (!this._gmpPath && this.isInstalled) {
       this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
                                    this._plugin.id,
-                                   GMPPrefs.get(KEY_PLUGIN_VERSION, null,
-                                                this._plugin.id));
+                                   GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION,
+                                                null, this._plugin.id));
     }
     return this._gmpPath;
   },
@@ -210,12 +141,12 @@ GMPWrapper.prototype = {
   get description() { return this._plugin.description; },
   get fullDescription() { return this._plugin.fullDescription; },
 
-  get version() { return GMPPrefs.get(KEY_PLUGIN_VERSION, null,
+  get version() { return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION, null,
                                       this._plugin.id); },
 
   get isActive() { return !this.appDisabled && !this.userDisabled; },
   get appDisabled() {
-    if (this._plugin.isEME && !GMPPrefs.get(KEY_EME_ENABLED, true)) {
+    if (this._plugin.isEME && !GMPPrefs.get(GMPPrefs.KEY_EME_ENABLED, true)) {
       // If "media.eme.enabled" is false, all EME plugins are disabled.
       return true;
     }
@@ -223,9 +154,10 @@ GMPWrapper.prototype = {
   },
 
   get userDisabled() {
-    return !GMPPrefs.get(KEY_PLUGIN_ENABLED, true, this._plugin.id);
+    return !GMPPrefs.get(GMPPrefs.KEY_PLUGIN_ENABLED, true, this._plugin.id);
   },
-  set userDisabled(aVal) { GMPPrefs.set(KEY_PLUGIN_ENABLED, aVal === false,
+  set userDisabled(aVal) { GMPPrefs.set(GMPPrefs.KEY_PLUGIN_ENABLED,
+                                        aVal === false,
                                         this._plugin.id); },
 
   get blocklistState() { return Ci.nsIBlocklistService.STATE_NOT_BLOCKED; },
@@ -246,7 +178,7 @@ GMPWrapper.prototype = {
   },
 
   get updateDate() {
-    let time = Number(GMPPrefs.get(KEY_PLUGIN_LAST_UPDATE, null,
+    let time = Number(GMPPrefs.get(GMPPrefs.KEY_PLUGIN_LAST_UPDATE, null,
                                    this._plugin.id));
     if (time !== NaN && this.isInstalled) {
       return new Date(time * 1000)
@@ -275,21 +207,21 @@ GMPWrapper.prototype = {
   },
 
   get applyBackgroundUpdates() {
-    if (!GMPPrefs.isSet(KEY_PLUGIN_AUTOUPDATE, this._plugin.id)) {
+    if (!GMPPrefs.isSet(GMPPrefs.KEY_PLUGIN_AUTOUPDATE, this._plugin.id)) {
       return AddonManager.AUTOUPDATE_DEFAULT;
     }
 
-    return GMPPrefs.get(KEY_PLUGIN_AUTOUPDATE, true, this._plugin.id) ?
+    return GMPPrefs.get(GMPPrefs.KEY_PLUGIN_AUTOUPDATE, true, this._plugin.id) ?
       AddonManager.AUTOUPDATE_ENABLE : AddonManager.AUTOUPDATE_DISABLE;
   },
 
   set applyBackgroundUpdates(aVal) {
     if (aVal == AddonManager.AUTOUPDATE_DEFAULT) {
-      GMPPrefs.reset(KEY_PLUGIN_AUTOUPDATE, this._plugin.id);
+      GMPPrefs.reset(GMPPrefs.KEY_PLUGIN_AUTOUPDATE, this._plugin.id);
     } else if (aVal == AddonManager.AUTOUPDATE_ENABLE) {
-      GMPPrefs.set(KEY_PLUGIN_AUTOUPDATE, true, this._plugin.id);
+      GMPPrefs.set(GMPPrefs.KEY_PLUGIN_AUTOUPDATE, true, this._plugin.id);
     } else if (aVal == AddonManager.AUTOUPDATE_DISABLE) {
-      GMPPrefs.set(KEY_PLUGIN_AUTOUPDATE, false, this._plugin.id);
+      GMPPrefs.set(GMPPrefs.KEY_PLUGIN_AUTOUPDATE, false, this._plugin.id);
     }
   },
 
@@ -307,7 +239,7 @@ GMPWrapper.prototype = {
       }
 
       let secSinceLastCheck =
-        Date.now() / 1000 - Preferences.get(KEY_PROVIDER_LASTCHECK, 0);
+        Date.now() / 1000 - Preferences.get(GMPPrefs.KEY_PROVIDER_LASTCHECK, 0);
       if (secSinceLastCheck <= SEC_IN_A_DAY) {
         this._log.trace("findUpdates() - " + this._plugin.id +
                         " - last check was less then a day ago");
@@ -400,6 +332,25 @@ GMPWrapper.prototype = {
   onPrefEMEGlobalEnabledChanged: function() {
     AddonManagerPrivate.callAddonListeners("onPropertyChanged", this,
                                            ["appDisabled"]);
+    if (this.appDisabled) {
+      AddonManagerPrivate.callAddonListeners("onUninstalling", this, false);
+      if (this._gmpPath) {
+        this._log.info("onPrefEMEGlobalEnabledChanged() - unregistering gmp " +
+                       "directory " + this._gmpPath);
+        gmpService.removePluginDirectory(this._gmpPath);
+      }
+      AddonManagerPrivate.callAddonListeners("onUninstalled", this);
+    } else {
+      AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this,
+                                               null, false);
+      AddonManagerPrivate.callAddonListeners("onInstalling", this, false);
+      if (this._gmpPath && this.isActive) {
+        this._log.info("onPrefEMEGlobalEnabledChanged() - registering gmp " +
+                       "directory " + this._gmpPath);
+        gmpService.addPluginDirectory(this._gmpPath);
+      }
+      AddonManagerPrivate.callAddonListeners("onInstalled", this);
+    }
     if (!this.userDisabled) {
       this._handleEnabledChanged();
     }
@@ -422,12 +373,13 @@ GMPWrapper.prototype = {
 
     AddonManagerPrivate.callInstallListeners("onExternalInstall", null, this,
                                              null, false);
+    AddonManagerPrivate.callAddonListeners("onInstalling", this, false);
     this._gmpPath = null;
     if (this.isInstalled) {
       this._gmpPath = OS.Path.join(OS.Constants.Path.profileDir,
                                    this._plugin.id,
-                                   GMPPrefs.get(KEY_PLUGIN_VERSION, null,
-                                                this._plugin.id));
+                                   GMPPrefs.get(GMPPrefs.KEY_PLUGIN_VERSION,
+                                                null, this._plugin.id));
     }
     if (this._gmpPath && this.isActive) {
       this._log.info("onPrefVersionChanged() - registering gmp directory " +
@@ -438,13 +390,15 @@ GMPWrapper.prototype = {
   },
 
   shutdown: function() {
-    Preferences.ignore(GMPPrefs.getPrefKey(KEY_PLUGIN_ENABLED, this._plugin.id),
+    Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_ENABLED,
+                                           this._plugin.id),
                        this.onPrefEnabledChanged, this);
-    Preferences.ignore(GMPPrefs.getPrefKey(KEY_PLUGIN_VERSION, this._plugin.id),
+    Preferences.ignore(GMPPrefs.getPrefKey(GMPPrefs.KEY_PLUGIN_VERSION,
+                                           this._plugin.id),
                        this.onPrefVersionChanged, this);
     if (this._plugin.isEME) {
-      Preferences.ignore(KEY_EME_ENABLED, this.onPrefEMEGlobalEnabledChanged,
-                         this);
+      Preferences.ignore(GMPPrefs.KEY_EME_ENABLED,
+                         this.onPrefEMEGlobalEnabledChanged, this);
     }
     return this._updateTask;
   },
@@ -462,7 +416,7 @@ let GMPProvider = {
     let telemetry = {};
     this.buildPluginList();
 
-    Preferences.observe(KEY_LOG_BASE, configureLogging);
+    Preferences.observe(GMPPrefs.KEY_LOG_BASE, configureLogging);
 
     for (let [id, plugin] of this._plugins) {
       let wrapper = plugin.wrapper;
@@ -490,7 +444,7 @@ let GMPProvider = {
       }
     }
 
-    if (Preferences.get(KEY_EME_ENABLED, false)) {
+    if (Preferences.get(GMPPrefs.KEY_EME_ENABLED, false)) {
       try {
         let greDir = Services.dirsvc.get(NS_GRE_DIR,
                                          Ci.nsILocalFile);
@@ -510,7 +464,7 @@ let GMPProvider = {
 
   shutdown: function() {
     this._log.trace("shutdown");
-    Preferences.ignore(KEY_LOG_BASE, configureLogging);
+    Preferences.ignore(GMPPrefs.KEY_LOG_BASE, configureLogging);
 
     let shutdownTask = Task.spawn(function* GMPProvider_shutdownTask() {
       this._log.trace("shutdown - shutdownTask");
@@ -541,7 +495,7 @@ let GMPProvider = {
     }
 
     let plugin = this._plugins.get(aId);
-    if (plugin) {
+    if (plugin && !GMPUtils.isPluginHidden(plugin)) {
       aCallback(plugin.wrapper);
     } else {
       aCallback(null);
@@ -555,12 +509,13 @@ let GMPProvider = {
       return;
     }
 
-    let results = [p.wrapper for ([id, p] of this._plugins)];
+    let results = [p.wrapper for ([id, p] of this._plugins)
+                    if (!GMPUtils.isPluginHidden(p))];
     aCallback(results);
   },
 
   get isEnabled() {
-    return GMPPrefs.get(KEY_PROVIDER_ENABLED, false);
+    return GMPPrefs.get(GMPPrefs.KEY_PROVIDER_ENABLED, false);
   },
 
   generateFullDescription: function(aPlugin) {
@@ -576,26 +531,21 @@ let GMPProvider = {
   },
 
   buildPluginList: function() {
-
-    let map = new Map();
-    GMP_PLUGINS.forEach(aPlugin => {
-      // Only show GMPs in addon manager that aren't hidden.
-      if (!GMPPrefs.get(KEY_PLUGIN_HIDDEN, false, aPlugin.id)) {
-        let plugin = {
-          id: aPlugin.id,
-          name: pluginsBundle.GetStringFromName(aPlugin.name),
-          description: pluginsBundle.GetStringFromName(aPlugin.description),
-          homepageURL: aPlugin.homepageURL,
-          optionsURL: aPlugin.optionsURL,
-          wrapper: null,
-          isEME: aPlugin.isEME
-        };
-        plugin.fullDescription = this.generateFullDescription(aPlugin);
-        plugin.wrapper = new GMPWrapper(plugin);
-        map.set(plugin.id, plugin);
-      }
-    }, this);
-    this._plugins = map;
+    this._plugins = new Map();
+    for (let aPlugin of GMP_PLUGINS) {
+      let plugin = {
+        id: aPlugin.id,
+        name: pluginsBundle.GetStringFromName(aPlugin.name),
+        description: pluginsBundle.GetStringFromName(aPlugin.description),
+        homepageURL: aPlugin.homepageURL,
+        optionsURL: aPlugin.optionsURL,
+        wrapper: null,
+        isEME: aPlugin.isEME,
+      };
+      plugin.fullDescription = this.generateFullDescription(aPlugin);
+      plugin.wrapper = new GMPWrapper(plugin);
+      this._plugins.set(plugin.id, plugin);
+    }
   },
 };
 

From 90c1248342ef99f30b04f268bc2eb7a1bd62ac50 Mon Sep 17 00:00:00 2001
From: Stephen Pohl <spohl.mozilla.bugs@gmail.com>
Date: Thu, 19 Mar 2015 22:59:45 -0400
Subject: [PATCH 14/80] Bug 1140263: Test updates. r=mossop

---
 .../tests/xpcshell/test_GMPInstallManager.js  |  59 +++----
 .../test/browser/browser_gmpProvider.js       | 144 +++++++-----------
 .../test/xpcshell/test_gmpProvider.js         |  51 ++++---
 3 files changed, 111 insertions(+), 143 deletions(-)

diff --git a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
index 1e257d78fcc2..b0938e0847d2 100644
--- a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
+++ b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
@@ -4,7 +4,7 @@
 const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} = Components;
 const URL_HOST = "http://localhost";
 
-Cu.import("resource://gre/modules/GMPInstallManager.jsm");
+let GMPScope = Cu.import("resource://gre/modules/GMPInstallManager.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
@@ -26,26 +26,26 @@ function run_test() {Cu.import("resource://gre/modules/Preferences.jsm")
 add_task(function* test_prefs() {
   let addon1 = "addon1", addon2 = "addon2";
 
-  GMPPrefs.set(GMPPrefs.KEY_URL, "http://not-really-used");
-  GMPPrefs.set(GMPPrefs.KEY_URL_OVERRIDE, "http://not-really-used-2");
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_LAST_UPDATE, "1", addon1);
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_VERSION, "2", addon1);
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_LAST_UPDATE, "3", addon2);
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_VERSION, "4", addon2);
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, false, addon2);
-  GMPPrefs.set(GMPPrefs.KEY_CERT_CHECKATTRS, true);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_URL, "http://not-really-used");
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_URL_OVERRIDE, "http://not-really-used-2");
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, "1", addon1);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, "2", addon1);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, "3", addon2);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, "4", addon2);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, false, addon2);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_CERT_CHECKATTRS, true);
 
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_URL), "http://not-really-used");
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_URL_OVERRIDE),
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_URL), "http://not-really-used");
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_URL_OVERRIDE),
               "http://not-really-used-2");
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_ADDON_LAST_UPDATE, "", addon1), "1");
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_ADDON_VERSION, "", addon1), "2");
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_ADDON_LAST_UPDATE, "", addon2), "3");
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_ADDON_VERSION, "", addon2), "4");
-  do_check_eq(GMPPrefs.get(GMPPrefs.KEY_ADDON_AUTOUPDATE, undefined, addon2),
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, "", addon1), "1");
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, "", addon1), "2");
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, "", addon2), "3");
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, "", addon2), "4");
+  do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, undefined, addon2),
               false);
-  do_check_true(GMPPrefs.get(GMPPrefs.KEY_CERT_CHECKATTRS));
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, true, addon2);
+  do_check_true(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_CERT_CHECKATTRS));
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, true, addon2);
 });
 
 /**
@@ -184,10 +184,10 @@ add_test(function test_checkForAddons_bad_ssl() {
   // Add random stuff that cause CertUtil to require https.
   //
   let PREF_KEY_URL_OVERRIDE_BACKUP =
-    Preferences.get(GMPPrefs.KEY_URL_OVERRIDE, undefined);
-  Preferences.reset(GMPPrefs.KEY_URL_OVERRIDE);
+    Preferences.get(GMPScope.GMPPrefs.KEY_URL_OVERRIDE, undefined);
+  Preferences.reset(GMPScope.GMPPrefs.KEY_URL_OVERRIDE);
 
-  let CERTS_BRANCH_DOT_ONE = GMPPrefs.CERTS_BRANCH + ".1";
+  let CERTS_BRANCH_DOT_ONE = GMPScope.GMPPrefs.KEY_CERTS_BRANCH + ".1";
   let PREF_CERTS_BRANCH_DOT_ONE_BACKUP =
     Preferences.get(CERTS_BRANCH_DOT_ONE, undefined);
   Services.prefs.setCharPref(CERTS_BRANCH_DOT_ONE, "funky value");
@@ -203,7 +203,7 @@ add_test(function test_checkForAddons_bad_ssl() {
                                        "not https."));
     installManager.uninit();
     if (PREF_KEY_URL_OVERRIDE_BACKUP) {
-      Preferences.set(GMPPrefs.KEY_URL_OVERRIDE,
+      Preferences.set(GMPScope.GMPPrefs.KEY_URL_OVERRIDE,
         PREF_KEY_URL_OVERRIDE_BACKUP);
     }
     if (PREF_CERTS_BRANCH_DOT_ONE_BACKUP) {
@@ -483,10 +483,11 @@ function* test_checkForAddons_installAddon(id, includeSize, wantInstallReject) {
     do_check_true(compareBinaryData(downloadedBytes, sourceBytes));
 
     // Make sure the prefs are set correctly
-    do_check_true(!!GMPPrefs.get(GMPPrefs.KEY_ADDON_LAST_UPDATE, "",
-                                 gmpAddon.id));
-    do_check_eq(GMPPrefs.get(GMPPrefs.KEY_ADDON_VERSION, "", gmpAddon.id),
-                             "1.1");
+    do_check_true(!!GMPScope.GMPPrefs.get(
+      GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, "", gmpAddon.id));
+    do_check_eq(GMPScope.GMPPrefs.get(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, "",
+                                      gmpAddon.id),
+                "1.1");
     // Make sure it reports as being installed
     do_check_true(gmpAddon.isInstalled);
 
@@ -518,7 +519,7 @@ add_task(test_checkForAddons_installAddon.bind(null, "3", true, true));
  * Tests simpleCheckAndInstall when autoupdate is disabled for a GMP
  */
 add_task(function* test_simpleCheckAndInstall_autoUpdateDisabled() {
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, false, OPEN_H264_ID);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, false, GMPScope.OPEN_H264_ID);
   let responseXML =
     "<?xml version=\"1.0\"?>" +
     "<updates>" +
@@ -536,8 +537,8 @@ add_task(function* test_simpleCheckAndInstall_autoUpdateDisabled() {
   let installManager = new GMPInstallManager();
   let result = yield installManager.simpleCheckAndInstall();
   do_check_eq(result.status, "nothing-new-to-install");
-  Preferences.reset(GMPPrefs.KEY_UPDATE_LAST_CHECK);
-  GMPPrefs.set(GMPPrefs.KEY_ADDON_AUTOUPDATE, true, OPEN_H264_ID);
+  Preferences.reset(GMPScope.GMPPrefs.KEY_UPDATE_LAST_CHECK);
+  GMPScope.GMPPrefs.set(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, true, GMPScope.OPEN_H264_ID);
 });
 
 /**
diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
index 550ea938cdb5..112014aefdc6 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -15,18 +15,15 @@ let gCategoryUtilities;
 let gIsEnUsLocale;
 
 let gMockAddons = [];
-let gMockEmeAddons = [];
 
 for (let plugin of GMPScope.GMP_PLUGINS) {
   let mockAddon = Object.freeze({
       id: plugin.id,
       isValid: true,
       isInstalled: false,
+      isEME: plugin.id.indexOf("gmp-eme-") == 0 ? true : false,
   });
   gMockAddons.push(mockAddon);
-  if (mockAddon.id.indexOf("gmp-eme-") == 0) {
-    gMockEmeAddons.push(mockAddon);
-  }
 }
 
 let gInstalledAddonId = "";
@@ -47,7 +44,6 @@ MockGMPInstallManager.prototype = {
   },
 };
 
-
 let gOptionsObserver = {
   lastDisplayed: null,
   observe: function(aSubject, aTopic, aData) {
@@ -86,8 +82,8 @@ function openDetailsView(aId) {
 }
 
 add_task(function* initializeState() {
-  gPrefs.setBoolPref(GMPScope.KEY_LOGGING_DUMP, true);
-  gPrefs.setIntPref(GMPScope.KEY_LOGGING_LEVEL, 0);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_LOGGING_DUMP, true);
+  gPrefs.setIntPref(GMPScope.GMPPrefs.KEY_LOGGING_LEVEL, 0);
 
   gManagerWindow = yield open_manager();
   gCategoryUtilities = new CategoryUtilities(gManagerWindow);
@@ -96,16 +92,16 @@ add_task(function* initializeState() {
     Services.obs.removeObserver(gOptionsObserver, AddonManager.OPTIONS_NOTIFICATION_DISPLAYED);
 
     for (let addon of gMockAddons) {
-      gPrefs.clearUserPref(getKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id));
-      gPrefs.clearUserPref(getKey(GMPScope.KEY_PLUGIN_LAST_UPDATE, addon.id));
-      gPrefs.clearUserPref(getKey(GMPScope.KEY_PLUGIN_AUTOUPDATE, addon.id));
-      gPrefs.clearUserPref(getKey(GMPScope.KEY_PLUGIN_VERSION, addon.id));
-      gPrefs.clearUserPref(getKey(GMPScope.KEY_PLUGIN_HIDDEN, addon.id));
+      gPrefs.clearUserPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id));
+      gPrefs.clearUserPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, addon.id));
+      gPrefs.clearUserPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id));
+      gPrefs.clearUserPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id));
+      gPrefs.clearUserPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, addon.id));
     }
-    gPrefs.clearUserPref(GMPScope.KEY_LOGGING_DUMP);
-    gPrefs.clearUserPref(GMPScope.KEY_LOGGING_LEVEL);
-    gPrefs.clearUserPref(GMPScope.KEY_PROVIDER_LASTCHECK);
-    gPrefs.clearUserPref(GMPScope.KEY_EME_ENABLED);
+    gPrefs.clearUserPref(GMPScope.GMPPrefs.KEY_LOGGING_DUMP);
+    gPrefs.clearUserPref(GMPScope.GMPPrefs.KEY_LOGGING_LEVEL);
+    gPrefs.clearUserPref(GMPScope.GMPPrefs.KEY_PROVIDER_LASTCHECK);
+    gPrefs.clearUserPref(GMPScope.GMPPrefs.KEY_EME_ENABLED);
     yield GMPScope.GMPProvider.shutdown();
     GMPScope.GMPProvider.startup();
   }));
@@ -117,13 +113,14 @@ add_task(function* initializeState() {
 
   // Start out with plugins not being installed, disabled and automatic updates
   // disabled.
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, true);
   for (let addon of gMockAddons) {
-    gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), false);
-    gPrefs.setIntPref(getKey(GMPScope.KEY_PLUGIN_LAST_UPDATE, addon.id), 0);
-    gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_AUTOUPDATE, addon.id), false);
-    gPrefs.setCharPref(getKey(GMPScope.KEY_PLUGIN_VERSION, addon.id), "");
-    gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_HIDDEN, addon.id), false);
+    gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), false);
+    gPrefs.setIntPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, addon.id), 0);
+    gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id), false);
+    gPrefs.setCharPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id), "");
+    gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, addon.id),
+                       true);
   }
   yield GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
@@ -176,7 +173,7 @@ add_task(function* testNotInstalled() {
   yield gCategoryUtilities.openType("plugin");
 
   for (let addon of gMockAddons) {
-    gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), true);
+    gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
     let item = get_addon_element(gManagerWindow, addon.id);
     Assert.ok(item, "Got add-on element:" + addon.id);
     item.parentNode.ensureElementIsVisible(item);
@@ -216,10 +213,10 @@ add_task(function* testNotInstalledDetails() {
 
 add_task(function* testInstalled() {
   for (let addon of gMockAddons) {
-    gPrefs.setIntPref(getKey(GMPScope.KEY_PLUGIN_LAST_UPDATE, addon.id),
+    gPrefs.setIntPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, addon.id),
                       TEST_DATE.getTime());
-    gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_AUTOUPDATE, addon.id), false);
-    gPrefs.setCharPref(getKey(GMPScope.KEY_PLUGIN_VERSION, addon.id), "1.2.3.4");
+    gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id), false);
+    gPrefs.setCharPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id), "1.2.3.4");
 
     yield gCategoryUtilities.openType("plugin");
 
@@ -276,63 +273,18 @@ add_task(function* testInstalledDetails() {
 });
 
 add_task(function* testInstalledGlobalEmeDisabled() {
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, false);
-  for (let addon of gMockEmeAddons) {
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, false);
+  for (let addon of gMockAddons) {
     yield gCategoryUtilities.openType("plugin");
 
     let item = get_addon_element(gManagerWindow, addon.id);
-    Assert.ok(item, "Got add-on element.");
-    item.parentNode.ensureElementIsVisible(item);
-    is(item.getAttribute("active"), "false");
-
-    let el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "warning");
-    is_element_hidden(el, "Warning notification is hidden.");
-    el = item.ownerDocument.getAnonymousElementByAttribute(item, "class", "disabled-postfix");
-    is_element_visible(el, "disabled-postfix is visible.");
-    el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "disable-btn");
-    is_element_hidden(el, "Disable button not visible.");
-    el = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "enable-btn");
-    is_element_hidden(el, "Enable button not visible.");
-
-    let menu = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "state-menulist");
-    is_element_visible(menu, "State menu should be visible.");
-
-    let neverActivate = item.ownerDocument.getAnonymousElementByAttribute(item, "anonid", "never-activate-menuitem");
-    is(menu.selectedItem, neverActivate, "Plugin state should be never-activate.");
+    if (addon.isEME) {
+      Assert.ok(!item, "Couldn't get add-on element.");
+    } else {
+      Assert.ok(item, "Got add-on element.");
+    }
   }
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
-});
-
-add_task(function* testInstalledGlobalEmeDisabledDetails() {
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, false);
-  for (let addon of gMockEmeAddons) {
-    yield openDetailsView(addon.id);
-    let doc = gManagerWindow.document;
-
-    let el = doc.getElementsByClassName("disabled-postfix")[0];
-    is_element_visible(el, "disabled-postfix is visible.");
-    el = doc.getElementById("detail-findUpdates-btn");
-    is_element_hidden(el, "Find updates link is hidden.");
-    el = doc.getElementById("detail-warning");
-    is_element_hidden(el, "Warning notification is hidden.");
-    el = doc.getElementsByTagName("setting")[0];
-
-    let contextMenu = doc.getElementById("addonitem-popup");
-    let deferred = Promise.defer();
-    let listener = () => {
-      contextMenu.removeEventListener("popupshown", listener, false);
-      deferred.resolve();
-    };
-    contextMenu.addEventListener("popupshown", listener, false);
-    el = doc.getElementsByClassName("detail-view-container")[0];
-    EventUtils.synthesizeMouse(el, 4, 4, { }, gManagerWindow);
-    EventUtils.synthesizeMouse(el, 4, 4, { type: "contextmenu", button: 2 }, gManagerWindow);
-    yield deferred.promise;
-    let menuSep = doc.getElementById("addonitem-menuseparator");
-    is_element_hidden(menuSep, "Menu separator is hidden.");
-    contextMenu.hidePopup();
-  }
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, true);
 });
 
 add_task(function* testPreferencesButton() {
@@ -351,9 +303,9 @@ add_task(function* testPreferencesButton() {
       yield close_manager(gManagerWindow);
       gManagerWindow = yield open_manager();
       gCategoryUtilities = new CategoryUtilities(gManagerWindow);
-      gPrefs.setCharPref(getKey(GMPScope.KEY_PLUGIN_VERSION, addon.id),
+      gPrefs.setCharPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
                          preferences.version);
-      gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id),
+      gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id),
                          preferences.enabled);
 
       yield gCategoryUtilities.openType("plugin");
@@ -372,7 +324,7 @@ add_task(function* testPreferencesButton() {
 });
 
 add_task(function* testUpdateButton() {
-  gPrefs.clearUserPref(GMPScope.KEY_PROVIDER_LASTCHECK);
+  gPrefs.clearUserPref(GMPScope.GMPPrefs.KEY_PROVIDER_LASTCHECK);
 
   let originalInstallManager = GMPScope.GMPInstallManager;
   Object.defineProperty(GMPScope, "GMPInstallManager", {
@@ -411,14 +363,10 @@ add_task(function* testUpdateButton() {
   });
 });
 
-add_task(function* testHidden() {
-  gPrefs.clearUserPref(GMPScope.KEY_PROVIDER_LASTCHECK);
-
+add_task(function* testEmeSupport() {
   for (let addon of gMockAddons) {
-    gPrefs.setBoolPref(getKey(GMPScope.KEY_PLUGIN_HIDDEN, addon.id), true);
+    gPrefs.clearUserPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, addon.id));
   }
-
-  // Hiding of plugins requires a restart of the GMP provider.
   yield GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
 
@@ -426,8 +374,26 @@ add_task(function* testHidden() {
     yield gCategoryUtilities.openType("plugin");
     let doc = gManagerWindow.document;
     let item = get_addon_element(gManagerWindow, addon.id);
-    Assert.equal(item, null);
+    if (addon.id == GMPScope.EME_ADOBE_ID) {
+      if (Services.appinfo.OS == "WINNT" &&
+          Services.sysinfo.getPropertyAsInt32("version") >= 6) {
+        Assert.ok(item, "Adobe EME supported, found add-on element.");
+      } else {
+        Assert.ok(!item,
+                  "Adobe EME not supported, couldn't find add-on element.");
+      }
+    } else {
+      Assert.ok(item, "Found add-on element.");
+    }
   }
+
+  for (let addon of gMockAddons) {
+    gPrefs.setBoolPref(getKey(GMPScope.GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, addon.id),
+                       true);
+  }
+  yield GMPScope.GMPProvider.shutdown();
+  GMPScope.GMPProvider.startup();
+
 });
 
 add_task(function* test_cleanup() {
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js b/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
index 224bd51943ea..4353f8156c22 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
@@ -47,11 +47,12 @@ function run_test() {
   createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
   startupManager();
 
-  gPrefs.setBoolPref(GMPScope.KEY_LOGGING_DUMP, true);
-  gPrefs.setIntPref(GMPScope.KEY_LOGGING_LEVEL, 0);
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_LOGGING_DUMP, true);
+  gPrefs.setIntPref(GMPScope.GMPPrefs.KEY_LOGGING_LEVEL, 0);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, true);
   for (let addon of gMockAddons.values()) {
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_HIDDEN, addon.id), false);
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_FORCEVISIBLE, addon.id),
+                       true);
   }
   GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
@@ -61,8 +62,8 @@ function run_test() {
 
 add_task(function* test_notInstalled() {
   for (let addon of gMockAddons.values()) {
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, addon.id), "");
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), false);
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id), "");
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), false);
   }
 
   let addons = yield promiseAddonsByIDs([...gMockAddons.keys()]);
@@ -126,10 +127,10 @@ add_task(function* test_installed() {
     let file = Services.dirsvc.get("ProfD", Ci.nsIFile);
     file.append(addon.id);
     file.append(TEST_VERSION);
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_ENABLED, mockAddon.id), false);
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_LAST_UPDATE, mockAddon.id),
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, mockAddon.id), false);
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_LAST_UPDATE, mockAddon.id),
                       "" + TEST_TIME_SEC);
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, mockAddon.id),
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, mockAddon.id),
                       TEST_VERSION);
 
     Assert.ok(addon.isInstalled);
@@ -165,7 +166,7 @@ add_task(function* test_enable() {
   Assert.equal(addons.length, gMockAddons.size);
 
   for (let addon of addons) {
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), true);
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
 
     Assert.ok(addon.isActive);
     Assert.ok(!addon.appDisabled);
@@ -180,7 +181,7 @@ add_task(function* test_globalEmeDisabled() {
   let addons = yield promiseAddonsByIDs([...gMockEmeAddons.keys()]);
   Assert.equal(addons.length, gMockEmeAddons.size);
 
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, false);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, false);
   GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
   for (let addon of addons) {
@@ -190,7 +191,7 @@ add_task(function* test_globalEmeDisabled() {
 
     Assert.equal(addon.permissions, 0);
   }
-  gPrefs.setBoolPref(GMPScope.KEY_EME_ENABLED, true);
+  gPrefs.setBoolPref(GMPScope.GMPPrefs.KEY_EME_ENABLED, true);
   GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
 });
@@ -200,7 +201,7 @@ add_task(function* test_autoUpdatePrefPersistance() {
   Assert.equal(addons.length, gMockAddons.size);
 
   for (let addon of addons) {
-    let autoupdateKey = gGetKey(GMPScope.KEY_PLUGIN_AUTOUPDATE, addon.id);
+    let autoupdateKey = gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id);
     gPrefs.clearUserPref(autoupdateKey);
 
     addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_DISABLE;
@@ -233,10 +234,10 @@ add_task(function* test_pluginRegistration() {
     };
 
     GMPScope.gmpService = MockGMPService;
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), true);
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
 
     // Check that the plugin gets registered after startup.
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, addon.id),
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
                       TEST_VERSION);
     clearPaths();
     yield promiseRestartManager();
@@ -245,7 +246,7 @@ add_task(function* test_pluginRegistration() {
 
     // Check that clearing the version doesn't trigger registration.
     clearPaths();
-    gPrefs.clearUserPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, addon.id));
+    gPrefs.clearUserPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id));
     Assert.deepEqual(addedPaths, []);
     Assert.deepEqual(removedPaths, [file.path]);
 
@@ -256,23 +257,23 @@ add_task(function* test_pluginRegistration() {
     Assert.equal(removedPaths.indexOf(file.path), -1);
 
     // Changing the pref mid-session should cause unregistration and registration.
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, addon.id),
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
                       TEST_VERSION);
     clearPaths();
     const TEST_VERSION_2 = "5.6.7.8";
     let file2 = Services.dirsvc.get("ProfD", Ci.nsIFile);
     file2.append(addon.id);
     file2.append(TEST_VERSION_2);
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, addon.id),
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
                       TEST_VERSION_2);
     Assert.deepEqual(addedPaths, [file2.path]);
     Assert.deepEqual(removedPaths, [file.path]);
 
     // Disabling the plugin should cause unregistration.
-    gPrefs.setCharPref(gGetKey(GMPScope.KEY_PLUGIN_VERSION, addon.id),
+    gPrefs.setCharPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_VERSION, addon.id),
                       TEST_VERSION);
     clearPaths();
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), false);
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), false);
     Assert.deepEqual(addedPaths, []);
     Assert.deepEqual(removedPaths, [file.path]);
 
@@ -284,7 +285,7 @@ add_task(function* test_pluginRegistration() {
 
     // Re-enabling the plugin should cause registration.
     clearPaths();
-    gPrefs.setBoolPref(gGetKey(GMPScope.KEY_PLUGIN_ENABLED, addon.id), true);
+    gPrefs.setBoolPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_ENABLED, addon.id), true);
     Assert.deepEqual(addedPaths, [file.path]);
     Assert.deepEqual(removedPaths, []);
     GMPScope = Cu.import("resource://gre/modules/addons/GMPProvider.jsm");
@@ -303,21 +304,21 @@ add_task(function* test_periodicUpdate() {
   Assert.equal(addons.length, gMockAddons.size);
 
   for (let addon of addons) {
-    gPrefs.clearUserPref(gGetKey(GMPScope.KEY_PLUGIN_AUTOUPDATE, addon.id));
+    gPrefs.clearUserPref(gGetKey(GMPScope.GMPPrefs.KEY_PLUGIN_AUTOUPDATE, addon.id));
 
     addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_DISABLE;
-    gPrefs.setIntPref(GMPScope.KEY_PROVIDER_LASTCHECK, 0);
+    gPrefs.setIntPref(GMPScope.GMPPrefs.KEY_PROVIDER_LASTCHECK, 0);
     let result =
       yield addon.findUpdates({}, AddonManager.UPDATE_WHEN_PERIODIC_UPDATE);
     Assert.strictEqual(result, false);
 
     addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_ENABLE;
-    gPrefs.setIntPref(GMPScope.KEY_PROVIDER_LASTCHECK, Date.now() / 1000 - 60);
+    gPrefs.setIntPref(GMPScope.GMPPrefs.KEY_PROVIDER_LASTCHECK, Date.now() / 1000 - 60);
     result =
       yield addon.findUpdates({}, AddonManager.UPDATE_WHEN_PERIODIC_UPDATE);
     Assert.strictEqual(result, false);
 
-    gPrefs.setIntPref(GMPScope.KEY_PROVIDER_LASTCHECK,
+    gPrefs.setIntPref(GMPScope.GMPPrefs.KEY_PROVIDER_LASTCHECK,
                      Date.now() / 1000 - 2 * GMPScope.SEC_IN_A_DAY);
     gInstalledAddonId = "";
     result =

From b8c729938b86e201889792db87075591f1a8cc91 Mon Sep 17 00:00:00 2001
From: Stephen Pohl <spohl.mozilla.bugs@gmail.com>
Date: Thu, 19 Mar 2015 22:59:49 -0400
Subject: [PATCH 15/80] Bug 1140263: Disable Adobe EME on all platforms for
 now. r=cpearce

---
 toolkit/modules/GMPUtils.jsm                             | 6 +-----
 .../extensions/test/browser/browser_gmpProvider.js       | 9 ++-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/toolkit/modules/GMPUtils.jsm b/toolkit/modules/GMPUtils.jsm
index f4e6caaade7c..9bd1b673b146 100644
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -47,11 +47,7 @@ this.GMPUtils = {
    */
   _isPluginSupported: function(aPlugin) {
     if (aPlugin.id == EME_ADOBE_ID) {
-      if (Services.appinfo.OS == "WINNT") {
-        return Services.sysinfo.getPropertyAsInt32("version") >= 6;
-      } else {
-        return false;
-      }
+      return false;
     }
     return true;
   },
diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
index 112014aefdc6..2a86664aca91 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -375,13 +375,8 @@ add_task(function* testEmeSupport() {
     let doc = gManagerWindow.document;
     let item = get_addon_element(gManagerWindow, addon.id);
     if (addon.id == GMPScope.EME_ADOBE_ID) {
-      if (Services.appinfo.OS == "WINNT" &&
-          Services.sysinfo.getPropertyAsInt32("version") >= 6) {
-        Assert.ok(item, "Adobe EME supported, found add-on element.");
-      } else {
-        Assert.ok(!item,
-                  "Adobe EME not supported, couldn't find add-on element.");
-      }
+      Assert.ok(!item,
+                "Adobe EME not supported, couldn't find add-on element.");
     } else {
       Assert.ok(item, "Found add-on element.");
     }

From 941b1d7ea23e6c2e28407591788e659b1be128d5 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 20 Mar 2015 09:39:20 +0100
Subject: [PATCH 16/80] Bug 1125113 - Change the keywords schema associating
 them with uris. r=ttaubert

---
 toolkit/components/places/Database.cpp        |  82 +++-
 toolkit/components/places/Database.h          |   3 +-
 toolkit/components/places/PlacesDBUtils.jsm   |  19 +-
 toolkit/components/places/PlacesUtils.jsm     |  82 ++--
 toolkit/components/places/UnifiedComplete.js  |  27 +-
 .../places/nsINavBookmarksService.idl         |   8 +-
 toolkit/components/places/nsNavBookmarks.cpp  | 452 ++++++++++--------
 toolkit/components/places/nsNavBookmarks.h    |  10 +-
 .../components/places/nsPlacesAutoComplete.js |  14 +-
 toolkit/components/places/nsPlacesIndexes.h   |   9 +
 toolkit/components/places/nsPlacesTables.h    |   2 +
 toolkit/components/places/nsPlacesTriggers.h  |  40 +-
 .../tests/autocomplete/test_keyword_search.js |  20 +-
 .../places/tests/bookmarks/test_keywords.js   | 372 +++++++++-----
 .../components/places/tests/head_common.js    |  16 +-
 .../places/tests/migration/places_v26.sqlite  | Bin 1179648 -> 1179648 bytes
 .../places/tests/migration/places_v27.sqlite  | Bin 0 -> 1212416 bytes
 .../tests/migration/test_current_from_v26.js  |  75 +++
 .../places/tests/migration/xpcshell.ini       |   2 +
 .../places/tests/queries/test_sorting.js      |   2 +-
 .../unifiedcomplete/test_keyword_search.js    |  26 +-
 .../test_keyword_search_actions.js            |  29 +-
 .../places/tests/unit/test_398914.js          | 132 +----
 .../tests/unit/test_async_transactions.js     |   6 +-
 .../places/tests/unit/test_placesTxn.js       |  12 +-
 .../tests/unit/test_preventive_maintenance.js |  61 +--
 .../places/tests/unit/test_telemetry.js       |   4 +-
 27 files changed, 827 insertions(+), 678 deletions(-)
 create mode 100644 toolkit/components/places/tests/migration/places_v27.sqlite
 create mode 100644 toolkit/components/places/tests/migration/test_current_from_v26.js

diff --git a/toolkit/components/places/Database.cpp b/toolkit/components/places/Database.cpp
index 502e24e294aa..3af8e4c6fed5 100644
--- a/toolkit/components/places/Database.cpp
+++ b/toolkit/components/places/Database.cpp
@@ -735,6 +735,13 @@ Database::InitSchema(bool* aDatabaseMigrated)
 
       // Firefox 37 uses schema version 26.
 
+      if (currentSchemaVersion < 27) {
+        rv = MigrateV27Up();
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+
+      // Firefox 38 uses schema version 27.
+
       // Schema Upgrades must add migration code here.
 
       rv = UpdateBookmarkRootTitles();
@@ -801,6 +808,8 @@ Database::InitSchema(bool* aDatabaseMigrated)
     // moz_keywords.
     rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_KEYWORDS);
     NS_ENSURE_SUCCESS(rv, rv);
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_KEYWORDS_PLACEPOSTDATA);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     // moz_favicons.
     rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_FAVICONS);
@@ -951,11 +960,18 @@ Database::InitTempTriggers()
   rv = mMainConn->ExecuteSimpleSQL(CREATE_PLACES_AFTERUPDATE_TYPED_TRIGGER);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = mMainConn->ExecuteSimpleSQL(CREATE_FOREIGNCOUNT_AFTERDELETE_TRIGGER);
+  rv = mMainConn->ExecuteSimpleSQL(CREATE_BOOKMARKS_FOREIGNCOUNT_AFTERDELETE_TRIGGER);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = mMainConn->ExecuteSimpleSQL(CREATE_FOREIGNCOUNT_AFTERINSERT_TRIGGER);
+  rv = mMainConn->ExecuteSimpleSQL(CREATE_BOOKMARKS_FOREIGNCOUNT_AFTERINSERT_TRIGGER);
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = mMainConn->ExecuteSimpleSQL(CREATE_FOREIGNCOUNT_AFTERUPDATE_TRIGGER);
+  rv = mMainConn->ExecuteSimpleSQL(CREATE_BOOKMARKS_FOREIGNCOUNT_AFTERUPDATE_TRIGGER);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  rv = mMainConn->ExecuteSimpleSQL(CREATE_KEYWORDS_FOREIGNCOUNT_AFTERDELETE_TRIGGER);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = mMainConn->ExecuteSimpleSQL(CREATE_KEYWORDS_FOREIGNCOUNT_AFTERINSERT_TRIGGER);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = mMainConn->ExecuteSimpleSQL(CREATE_KEYWORDS_FOREIGNCOUNT_AFTERUPDATE_TRIGGER);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -1487,6 +1503,66 @@ Database::MigrateV26Up() {
   return NS_OK;
 }
 
+nsresult
+Database::MigrateV27Up() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  // Change keywords store, moving their relation from bookmarks to urls.
+  nsCOMPtr<mozIStorageStatement> stmt;
+  nsresult rv = mMainConn->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT place_id FROM moz_keywords"
+  ), getter_AddRefs(stmt));
+  if (NS_FAILED(rv)) {
+    // Even if these 2 columns have a unique constraint, we allow NULL values
+    // for backwards compatibility. NULL never breaks a unique constraint.
+    rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+      "ALTER TABLE moz_keywords ADD COLUMN place_id INTEGER"));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+      "ALTER TABLE moz_keywords ADD COLUMN post_data TEXT"));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_KEYWORDS_PLACEPOSTDATA);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // Associate keywords with uris.  A keyword could be associated to multiple
+  // bookmarks uris, or multiple keywords could be associated to the same uri.
+  // The new system only allows multiple uris per keyword, provided they have
+  // a different post_data value.
+  rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "INSERT OR REPLACE INTO moz_keywords (id, keyword, place_id, post_data) "
+    "SELECT k.id, k.keyword, h.id, MAX(a.content) "
+    "FROM moz_places h "
+    "JOIN moz_bookmarks b ON b.fk = h.id "
+    "JOIN moz_keywords k ON k.id = b.keyword_id "
+    "LEFT JOIN moz_items_annos a ON a.item_id = b.id "
+    "LEFT JOIN moz_anno_attributes n ON a.anno_attribute_id = n.id "
+                                   "AND n.name = 'bookmarkProperties/POSTData'"
+    "WHERE k.place_id ISNULL "
+    "GROUP BY keyword"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Remove any keyword that points to a non-existing place id.
+  rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "DELETE FROM moz_keywords "
+    "WHERE NOT EXISTS (SELECT 1 FROM moz_places WHERE id = moz_keywords.place_id)"));
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "UPDATE moz_bookmarks SET keyword_id = NULL "
+    "WHERE NOT EXISTS (SELECT 1 FROM moz_keywords WHERE id = moz_bookmarks.keyword_id)"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Adjust foreign_count for all the rows.
+  rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "UPDATE moz_places SET foreign_count = "
+    "(SELECT count(*) FROM moz_bookmarks WHERE fk = moz_places.id) + "
+    "(SELECT count(*) FROM moz_keywords WHERE place_id = moz_places.id) "
+  ));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 void
 Database::Shutdown()
 {
diff --git a/toolkit/components/places/Database.h b/toolkit/components/places/Database.h
index c6ac97064f0e..b89f52be9240 100644
--- a/toolkit/components/places/Database.h
+++ b/toolkit/components/places/Database.h
@@ -16,7 +16,7 @@
 
 // This is the schema version. Update it at any schema change and add a
 // corresponding migrateVxx method below.
-#define DATABASE_SCHEMA_VERSION 26
+#define DATABASE_SCHEMA_VERSION 27
 
 // Fired after Places inited.
 #define TOPIC_PLACES_INIT_COMPLETE "places-init-complete"
@@ -274,6 +274,7 @@ protected:
   nsresult MigrateV24Up();
   nsresult MigrateV25Up();
   nsresult MigrateV26Up();
+  nsresult MigrateV27Up();
 
   nsresult UpdateBookmarkRootTitles();
 
diff --git a/toolkit/components/places/PlacesDBUtils.jsm b/toolkit/components/places/PlacesDBUtils.jsm
index d1fa8de7fef5..b8f4e1affc17 100644
--- a/toolkit/components/places/PlacesDBUtils.jsm
+++ b/toolkit/components/places/PlacesDBUtils.jsm
@@ -474,23 +474,6 @@ this.PlacesDBUtils = {
     fixOrphanItems.params["tagsGuid"] = PlacesUtils.bookmarks.tagsGuid;
     cleanupStatements.push(fixOrphanItems);
 
-    // D.5 fix wrong keywords
-    let fixInvalidKeywords = DBConn.createAsyncStatement(
-      `UPDATE moz_bookmarks SET keyword_id = NULL WHERE guid NOT IN (
-         :rootGuid, :menuGuid, :toolbarGuid, :unfiledGuid, :tagsGuid  /* skip roots */
-       ) AND id IN (
-         SELECT id FROM moz_bookmarks b
-         WHERE keyword_id NOT NULL
-           AND NOT EXISTS
-             (SELECT id FROM moz_keywords WHERE id = b.keyword_id LIMIT 1)
-       )`);
-    fixInvalidKeywords.params["rootGuid"] = PlacesUtils.bookmarks.rootGuid;
-    fixInvalidKeywords.params["menuGuid"] = PlacesUtils.bookmarks.menuGuid;
-    fixInvalidKeywords.params["toolbarGuid"] = PlacesUtils.bookmarks.toolbarGuid;
-    fixInvalidKeywords.params["unfiledGuid"] = PlacesUtils.bookmarks.unfiledGuid;
-    fixInvalidKeywords.params["tagsGuid"] = PlacesUtils.bookmarks.tagsGuid;
-    cleanupStatements.push(fixInvalidKeywords);
-
     // D.6 fix wrong item types
     //     Folders and separators should not have an fk.
     //     If they have a valid fk convert them to bookmarks. Later in D.9 we
@@ -681,7 +664,7 @@ this.PlacesDBUtils = {
       `DELETE FROM moz_keywords WHERE id IN (
          SELECT id FROM moz_keywords k
          WHERE NOT EXISTS
-           (SELECT id FROM moz_bookmarks WHERE keyword_id = k.id LIMIT 1)
+           (SELECT 1 FROM moz_places h WHERE k.place_id = h.id)
        )`);
     cleanupStatements.push(deleteUnusedKeywords);
 
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index f84799173778..305ba3a4433f 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -812,13 +812,26 @@ this.PlacesUtils = {
    *   @param aBookmarkId
    *   @returns string of POST data
    */
-  setPostDataForBookmark: function PU_setPostDataForBookmark(aBookmarkId, aPostData) {
-    const annos = this.annotations;
-    if (aPostData)
-      annos.setItemAnnotation(aBookmarkId, this.POST_DATA_ANNO, aPostData, 
-                              0, Ci.nsIAnnotationService.EXPIRE_NEVER);
-    else if (annos.itemHasAnnotation(aBookmarkId, this.POST_DATA_ANNO))
-      annos.removeItemAnnotation(aBookmarkId, this.POST_DATA_ANNO);
+  setPostDataForBookmark(aBookmarkId, aPostData) {
+    // For now we don't have a unified API to create a keyword with postData,
+    // thus here we can just try to complete a keyword that should already exist
+    // without any post data.
+    let nullPostDataFragment = aPostData ? "AND post_data ISNULL" : "";
+    let stmt = PlacesUtils.history.DBConnection.createStatement(
+      `UPDATE moz_keywords SET post_data = :post_data
+       WHERE id = (SELECT k.id FROM moz_keywords k
+                   JOIN moz_bookmarks b ON b.fk = k.place_id
+                   WHERE b.id = :item_id
+                   ${nullPostDataFragment}
+                   LIMIT 1)`);
+    stmt.params.item_id = aBookmarkId;
+    stmt.params.post_data = aPostData;
+    try {
+      stmt.execute();
+    }
+    finally {
+      stmt.finalize();
+    }
   },
 
   /**
@@ -826,12 +839,22 @@ this.PlacesUtils = {
    * @param aBookmarkId
    * @returns string of POST data if set for aBookmarkId. null otherwise.
    */
-  getPostDataForBookmark: function PU_getPostDataForBookmark(aBookmarkId) {
-    const annos = this.annotations;
-    if (annos.itemHasAnnotation(aBookmarkId, this.POST_DATA_ANNO))
-      return annos.getItemAnnotation(aBookmarkId, this.POST_DATA_ANNO);
-
-    return null;
+  getPostDataForBookmark(aBookmarkId) {
+    let stmt = PlacesUtils.history.DBConnection.createStatement(
+      `SELECT k.post_data
+       FROM moz_keywords k
+       JOIN moz_places h ON h.id = k.place_id
+       JOIN moz_bookmarks b ON b.fk = h.id
+       WHERE b.id = :item_id`);
+    stmt.params.item_id = aBookmarkId;
+    try {
+      if (!stmt.executeStep())
+        return null;
+      return stmt.row.post_data;
+    }
+    finally {
+      stmt.finalize();
+    }
   },
 
   /**
@@ -839,24 +862,21 @@ this.PlacesUtils = {
    * @param aKeyword string keyword
    * @returns an array containing a string URL and a string of POST data
    */
-  getURLAndPostDataForKeyword: function PU_getURLAndPostDataForKeyword(aKeyword) {
-    var url = null, postdata = null;
+  getURLAndPostDataForKeyword(aKeyword) {
+    let stmt = PlacesUtils.history.DBConnection.createStatement(
+      `SELECT h.url, k.post_data
+       FROM moz_keywords k
+       JOIN moz_places h ON h.id = k.place_id
+       WHERE k.keyword = :keyword`);
+    stmt.params.keyword = aKeyword;
     try {
-      var uri = this.bookmarks.getURIForKeyword(aKeyword);
-      if (uri) {
-        url = uri.spec;
-        var bookmarks = this.bookmarks.getBookmarkIdsForURI(uri);
-        for (let i = 0; i < bookmarks.length; i++) {
-          var bookmark = bookmarks[i];
-          var kw = this.bookmarks.getKeywordForBookmark(bookmark);
-          if (kw == aKeyword) {
-            postdata = this.getPostDataForBookmark(bookmark);
-            break;
-          }
-        }
-      }
-    } catch(ex) {}
-    return [url, postdata];
+      if (!stmt.executeStep())
+        return [ null, null ];
+      return [ stmt.row.url, stmt.row.post_data ];
+    }
+    finally {
+      stmt.finalize();
+    }
   },
 
   /**
@@ -3069,7 +3089,7 @@ PlacesSortFolderByNameTransaction.prototype = {
     let callback = {
       _self: this,
       runBatched: function() {
-        for (item in this._self._oldOrder)
+        for (let item in this._self._oldOrder)
           PlacesUtils.bookmarks.setItemIndex(item, this._self._oldOrder[item]);
       }
     };
diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js
index b6d0621cc506..727f70a7bdcb 100644
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -152,24 +152,20 @@ const SQL_ADAPTIVE_QUERY =
 const SQL_KEYWORD_QUERY =
   `/* do not warn (bug 487787) */
    SELECT :query_type,
-     (SELECT REPLACE(url, '%s', :query_string) FROM moz_places WHERE id = b.fk)
-     AS search_url, h.title,
+          REPLACE(h.url, '%s', :query_string) AS search_url, h.title,
      IFNULL(f.url, (SELECT f.url
                     FROM moz_places
                     JOIN moz_favicons f ON f.id = favicon_id
-                    WHERE rev_host = (SELECT rev_host FROM moz_places WHERE id = b.fk)
+                    WHERE rev_host = h.rev_host
                     ORDER BY frecency DESC
                     LIMIT 1)
            ),
-     1, b.title, NULL, h.visit_count, h.typed, IFNULL(h.id, b.fk),
-     t.open_count, h.frecency
+     1, NULL, NULL, h.visit_count, h.typed, h.id, t.open_count, h.frecency
    FROM moz_keywords k
-   JOIN moz_bookmarks b ON b.keyword_id = k.id
-   LEFT JOIN moz_places h ON h.url = search_url
+   JOIN moz_places h ON k.place_id = h.id
    LEFT JOIN moz_favicons f ON f.id = h.favicon_id
    LEFT JOIN moz_openpages_temp t ON t.url = search_url
-   WHERE LOWER(k.keyword) = LOWER(:keyword)
-   ORDER BY h.frecency DESC`;
+   WHERE k.keyword = LOWER(:keyword)`;
 
 function hostQuery(conditions = "") {
   let query =
@@ -1241,24 +1237,13 @@ Search.prototype = {
     let title = bookmarkTitle || historyTitle;
 
     if (queryType == QUERYTYPE_KEYWORD) {
+      match.style = "keyword";
       if (this._enableActions) {
-        match.style = "keyword";
         url = makeActionURL("keyword", {
           url: escapedURL,
           input: this._originalSearchString,
         });
         action = "keyword";
-      } else {
-        // If we do not have a title, then we must have a keyword, so let the UI
-        // know it is a keyword.  Otherwise, we found an exact page match, so just
-        // show the page like a regular result.  Because the page title is likely
-        // going to be more specific than the bookmark title (keyword title).
-        if (!historyTitle) {
-          match.style = "keyword"
-        }
-        else {
-          title = historyTitle;
-        }
       }
     }
 
diff --git a/toolkit/components/places/nsINavBookmarksService.idl b/toolkit/components/places/nsINavBookmarksService.idl
index 2afa1fbe1a5d..13d803d27569 100644
--- a/toolkit/components/places/nsINavBookmarksService.idl
+++ b/toolkit/components/places/nsINavBookmarksService.idl
@@ -222,7 +222,7 @@ interface nsINavBookmarkObserver : nsISupports
  * folders.  A URI in history can be contained in one or more such folders.
  */
 
-[scriptable, uuid(b0f9a80a-d7f0-4421-8513-444125f0d828)]
+[scriptable, uuid(24533891-afa6-4663-b72d-3143d03f1b04)]
 interface nsINavBookmarksService : nsISupports
 {
   /**
@@ -536,12 +536,6 @@ interface nsINavBookmarksService : nsISupports
    */
   void setKeywordForBookmark(in long long aItemId, in AString aKeyword);
 
-  /**
-   * Retrieves the keyword for the given URI. Will be void string
-   * (null in JS) if no such keyword is found.
-   */
-  AString getKeywordForURI(in nsIURI aURI);
-
   /**
    * Retrieves the keyword for the given bookmark. Will be void string
    * (null in JS) if no such keyword is found.
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
index cbf8310802a7..7161ca458c82 100644
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -19,8 +19,6 @@
 
 #include "GeckoProfiler.h"
 
-#define BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_LENGTH 32
-
 using namespace mozilla;
 
 // These columns sit to the right of the kGetInfoIndex_* columns.
@@ -40,25 +38,6 @@ PLACES_FACTORY_SINGLETON_IMPLEMENTATION(nsNavBookmarks, gBookmarksService)
 
 namespace {
 
-struct keywordSearchData
-{
-  int64_t itemId;
-  nsString keyword;
-};
-
-PLDHashOperator
-SearchBookmarkForKeyword(nsTrimInt64HashKey::KeyType aKey,
-                         const nsString aValue,
-                         void* aUserArg)
-{
-  keywordSearchData* data = reinterpret_cast<keywordSearchData*>(aUserArg);
-  if (data->keyword.Equals(aValue)) {
-    data->itemId = aKey;
-    return PL_DHASH_STOP;
-  }
-  return PL_DHASH_NEXT;
-}
-
 template<typename Method, typename DataType>
 class AsyncGetBookmarksForURI : public AsyncStatementCallback
 {
@@ -143,8 +122,6 @@ nsNavBookmarks::nsNavBookmarks()
   , mCanNotify(false)
   , mCacheObservers("bookmark-observers")
   , mBatching(false)
-  , mBookmarkToKeywordHash(BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_LENGTH)
-  , mBookmarkToKeywordHashInitialized(false)
 {
   NS_ASSERTION(!gBookmarksService,
                "Attempting to create two instances of the service!");
@@ -646,11 +623,12 @@ nsNavBookmarks::RemoveItem(int64_t aItemId)
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
-    rv = UpdateKeywordsHashForRemovedBookmark(aItemId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
     // A broken url should not interrupt the removal process.
-    (void)NS_NewURI(getter_AddRefs(uri), bookmark.url);
+    rv = NS_NewURI(getter_AddRefs(uri), bookmark.url);
+    if (NS_SUCCEEDED(rv)) {
+      rv = UpdateKeywordsForRemovedBookmark(bookmark);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
   }
 
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
@@ -1108,8 +1086,14 @@ nsNavBookmarks::RemoveFolderChildren(int64_t aFolderId)
   rv = SetItemDateInternal(LAST_MODIFIED, folder.id, RoundedPRNow());
   NS_ENSURE_SUCCESS(rv, rv);
 
-  for (uint32_t i = 0; i < folderChildrenArray.Length(); i++) {
+  rv = transaction.Commit();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Call observers in reverse order to serve children before their parent.
+  for (int32_t i = folderChildrenArray.Length() - 1; i >= 0; --i) {
     BookmarkData& child = folderChildrenArray[i];
+
+    nsCOMPtr<nsIURI> uri;
     if (child.type == TYPE_BOOKMARK) {
       // If not a tag, recalculate frecency for this entry, since it changed.
       if (child.grandParentId != mTagsRoot) {
@@ -1119,21 +1103,12 @@ nsNavBookmarks::RemoveFolderChildren(int64_t aFolderId)
         NS_ENSURE_SUCCESS(rv, rv);
       }
 
-      rv = UpdateKeywordsHashForRemovedBookmark(child.id);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-  }
-
-  rv = transaction.Commit();
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // Call observers in reverse order to serve children before their parent.
-  for (int32_t i = folderChildrenArray.Length() - 1; i >= 0; --i) {
-    BookmarkData& child = folderChildrenArray[i];
-    nsCOMPtr<nsIURI> uri;
-    if (child.type == TYPE_BOOKMARK) {
       // A broken url should not interrupt the removal process.
-      (void)NS_NewURI(getter_AddRefs(uri), child.url);
+      rv = NS_NewURI(getter_AddRefs(uri), child.url);
+      if (NS_SUCCEEDED(rv)) {
+        rv = UpdateKeywordsForRemovedBookmark(child);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
     }
 
     NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
@@ -2264,39 +2239,69 @@ nsNavBookmarks::SetItemIndex(int64_t aItemId, int32_t aNewIndex)
 
 
 nsresult
-nsNavBookmarks::UpdateKeywordsHashForRemovedBookmark(int64_t aItemId)
+nsNavBookmarks::UpdateKeywordsForRemovedBookmark(const BookmarkData& aBookmark)
 {
-  nsAutoString keyword;
-  if (NS_SUCCEEDED(GetKeywordForBookmark(aItemId, keyword)) &&
-      !keyword.IsEmpty()) {
-    nsresult rv = EnsureKeywordsHash();
+  // If there are no keywords for this URI, there's nothing to do.
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = NS_NewURI(getter_AddRefs(uri), aBookmark.url);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsTArray<nsString> keywords;
+  {
+    nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+      "SELECT keyword FROM moz_keywords WHERE place_id = :place_id "
+    );
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scoper(stmt);
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("place_id"), aBookmark.placeId);
     NS_ENSURE_SUCCESS(rv, rv);
-    mBookmarkToKeywordHash.Remove(aItemId);
 
-    // If the keyword is unused, remove it from the database.
-    keywordSearchData searchData;
-    searchData.keyword.Assign(keyword);
-    searchData.itemId = -1;
-    mBookmarkToKeywordHash.EnumerateRead(SearchBookmarkForKeyword, &searchData);
-    if (searchData.itemId == -1) {
-      nsCOMPtr<mozIStorageAsyncStatement> stmt = mDB->GetAsyncStatement(
-        "DELETE FROM moz_keywords "
-        "WHERE keyword = :keyword "
-        "AND NOT EXISTS ( "
-          "SELECT id "
-          "FROM moz_bookmarks "
-          "WHERE keyword_id = moz_keywords.id "
-        ")"
-      );
-      NS_ENSURE_STATE(stmt);
-
-      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
-      NS_ENSURE_SUCCESS(rv, rv);
-      nsCOMPtr<mozIStoragePendingStatement> pendingStmt;
-      rv = stmt->ExecuteAsync(nullptr, getter_AddRefs(pendingStmt));
+    bool hasMore;
+    while (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
+      nsAutoString keyword;
+      rv = stmt->GetString(0, keyword);
       NS_ENSURE_SUCCESS(rv, rv);
+      keywords.AppendElement(keyword);
     }
   }
+
+  if (keywords.Length() == 0) {
+    // This uri has no keywords associated, so there's nothing to do.
+    return NS_OK;
+  }
+
+  // If the uri is not bookmarked anymore, we can remove its keywords.
+  nsTArray<BookmarkData> bookmarks;
+  rv = GetBookmarksForURI(uri, bookmarks);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (bookmarks.Length() == 0) {
+    for (uint32_t i = 0; i < keywords.Length(); ++i) {
+      nsString keyword = keywords[i];
+
+      nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+        "DELETE FROM moz_keywords WHERE keyword = :keyword "
+      );
+      NS_ENSURE_STATE(stmt);
+      mozStorageStatementScoper scoper(stmt);
+      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->Execute();
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                     nsINavBookmarkObserver,
+                     OnItemChanged(aBookmark.id,
+                                   NS_LITERAL_CSTRING("keyword"),
+                                   false,
+                                   EmptyCString(),
+                                   aBookmark.lastModified,
+                                   TYPE_BOOKMARK,
+                                   aBookmark.parentId,
+                                   aBookmark.guid,
+                                   aBookmark.parentGuid));
+  }
+
   return NS_OK;
 }
 
@@ -2311,121 +2316,163 @@ nsNavBookmarks::SetKeywordForBookmark(int64_t aBookmarkId,
   BookmarkData bookmark;
   nsresult rv = FetchItemInfo(aBookmarkId, bookmark);
   NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = EnsureKeywordsHash();
+  nsCOMPtr<nsIURI> uri;
+  rv = NS_NewURI(getter_AddRefs(uri), bookmark.url);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Shortcuts are always lowercased internally.
   nsAutoString keyword(aUserCasedKeyword);
   ToLowerCase(keyword);
 
-  // Check if bookmark was already associated to a keyword.
-  nsAutoString oldKeyword;
-  rv = GetKeywordForBookmark(bookmark.id, oldKeyword);
-  NS_ENSURE_SUCCESS(rv, rv);
+  // The same URI can be associated to more than one keyword, provided the post
+  // data differs.  Check if there are already keywords associated to this uri.
+  nsTArray<nsString> oldKeywords;
+  {
+    nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+      "SELECT keyword FROM moz_keywords WHERE place_id = :place_id"
+    );
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scoper(stmt);
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("place_id"), bookmark.placeId);
+    NS_ENSURE_SUCCESS(rv, rv);
 
-  // Trying to set the same value or to remove a nonexistent keyword is a no-op.
-  if (keyword.Equals(oldKeyword) || (keyword.IsEmpty() && oldKeyword.IsEmpty()))
+    bool hasMore;
+    while (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
+      nsString oldKeyword;
+      rv = stmt->GetString(0, oldKeyword);
+      NS_ENSURE_SUCCESS(rv, rv);
+      oldKeywords.AppendElement(oldKeyword);
+    }
+  }
+
+  // Trying to remove a non-existent keyword is a no-op.
+  if (keyword.IsEmpty() && oldKeywords.Length() == 0) {
     return NS_OK;
-
-  mozStorageTransaction transaction(mDB->MainConn(), false);
-
-  nsCOMPtr<mozIStorageStatement> updateBookmarkStmt = mDB->GetStatement(
-    "UPDATE moz_bookmarks "
-    "SET keyword_id = (SELECT id FROM moz_keywords WHERE keyword = :keyword), "
-        "lastModified = :date "
-    "WHERE id = :item_id "
-  );
-  NS_ENSURE_STATE(updateBookmarkStmt);
-  mozStorageStatementScoper updateBookmarkScoper(updateBookmarkStmt);
+  }
 
   if (keyword.IsEmpty()) {
-    // Remove keyword association from the hash.
-    mBookmarkToKeywordHash.Remove(bookmark.id);
-    rv = updateBookmarkStmt->BindNullByName(NS_LITERAL_CSTRING("keyword"));
+    // We are removing the existing keywords.
+    for (uint32_t i = 0; i < oldKeywords.Length(); ++i) {
+      nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+        "DELETE FROM moz_keywords WHERE keyword = :old_keyword"
+      );
+      NS_ENSURE_STATE(stmt);
+      mozStorageStatementScoper scoper(stmt);
+      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("old_keyword"),
+                                  oldKeywords[i]);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->Execute();
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    nsTArray<BookmarkData> bookmarks;
+    rv = GetBookmarksForURI(uri, bookmarks);
+    NS_ENSURE_SUCCESS(rv, rv);
+    for (uint32_t i = 0; i < bookmarks.Length(); ++i) {
+      NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                       nsINavBookmarkObserver,
+                       OnItemChanged(bookmarks[i].id,
+                                     NS_LITERAL_CSTRING("keyword"),
+                                     false,
+                                     EmptyCString(),
+                                     bookmarks[i].lastModified,
+                                     TYPE_BOOKMARK,
+                                     bookmarks[i].parentId,
+                                     bookmarks[i].guid,
+                                     bookmarks[i].parentGuid));
+    }
+
+    return NS_OK;
   }
-   else {
-    // We are associating bookmark to a new keyword. Create a new keyword
-    // record if needed.
-    nsCOMPtr<mozIStorageStatement> newKeywordStmt = mDB->GetStatement(
-      "INSERT OR IGNORE INTO moz_keywords (keyword) VALUES (:keyword)"
+
+  // A keyword can only be associated to a single URI.  Check if the requested
+  // keyword was already associated, in such a case we will need to notify about
+  // the change.
+  nsCOMPtr<nsIURI> oldUri;
+  {
+    nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
+      "SELECT url "
+      "FROM moz_keywords "
+      "JOIN moz_places h ON h.id = place_id "
+      "WHERE keyword = :keyword"
     );
-    NS_ENSURE_STATE(newKeywordStmt);
-    mozStorageStatementScoper newKeywordScoper(newKeywordStmt);
-
-    rv = newKeywordStmt->BindStringByName(NS_LITERAL_CSTRING("keyword"),
-                                          keyword);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = newKeywordStmt->Execute();
+    NS_ENSURE_STATE(stmt);
+    mozStorageStatementScoper scoper(stmt);
+    rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    // Add new keyword association to the hash, removing the old one if needed.
-    if (!oldKeyword.IsEmpty())
-      mBookmarkToKeywordHash.Remove(bookmark.id);
-    mBookmarkToKeywordHash.Put(bookmark.id, keyword);
-    rv = updateBookmarkStmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
+    bool hasMore;
+    if (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
+      nsAutoCString spec;
+      rv = stmt->GetUTF8String(0, spec);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = NS_NewURI(getter_AddRefs(oldUri), spec);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
   }
-  NS_ENSURE_SUCCESS(rv, rv);
-  bookmark.lastModified = RoundedPRNow();
-  rv = updateBookmarkStmt->BindInt64ByName(NS_LITERAL_CSTRING("date"),
-                                           bookmark.lastModified);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = updateBookmarkStmt->BindInt64ByName(NS_LITERAL_CSTRING("item_id"),
-                                           bookmark.id);
-  NS_ENSURE_SUCCESS(rv, rv);
-  rv = updateBookmarkStmt->Execute();
-  NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = transaction.Commit();
-  NS_ENSURE_SUCCESS(rv, rv);
+  // If another uri is using the new keyword, we must update the keyword entry.
+  // Note we cannot use INSERT OR REPLACE cause it wouldn't invoke the delete
+  // trigger.
+  nsCOMPtr<mozIStorageStatement> stmt;
+  if (oldUri) {
+    // In both cases, notify about the change.
+    nsTArray<BookmarkData> bookmarks;
+    rv = GetBookmarksForURI(oldUri, bookmarks);
+    NS_ENSURE_SUCCESS(rv, rv);
+    for (uint32_t i = 0; i < bookmarks.Length(); ++i) {
+      NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                       nsINavBookmarkObserver,
+                       OnItemChanged(bookmarks[i].id,
+                                     NS_LITERAL_CSTRING("keyword"),
+                                     false,
+                                     EmptyCString(),
+                                     bookmarks[i].lastModified,
+                                     TYPE_BOOKMARK,
+                                     bookmarks[i].parentId,
+                                     bookmarks[i].guid,
+                                     bookmarks[i].parentGuid));
+    }
 
-  NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
-                   nsINavBookmarkObserver,
-                   OnItemChanged(bookmark.id,
-                                 NS_LITERAL_CSTRING("keyword"),
-                                 false,
-                                 NS_ConvertUTF16toUTF8(keyword),
-                                 bookmark.lastModified,
-                                 bookmark.type,
-                                 bookmark.parentId,
-                                 bookmark.guid,
-                                 bookmark.parentGuid));
-
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsNavBookmarks::GetKeywordForURI(nsIURI* aURI, nsAString& aKeyword)
-{
-  PLACES_WARN_DEPRECATED();
-
-  NS_ENSURE_ARG(aURI);
-  aKeyword.Truncate(0);
-
-  nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
-    "SELECT k.keyword "
-    "FROM moz_places h "
-    "JOIN moz_bookmarks b ON b.fk = h.id "
-    "JOIN moz_keywords k ON k.id = b.keyword_id "
-    "WHERE h.url = :page_url "
-  );
+    stmt = mDB->GetStatement(
+      "UPDATE moz_keywords SET place_id = :place_id WHERE keyword = :keyword"
+    );
+    NS_ENSURE_STATE(stmt);
+  }
+  else {
+    stmt = mDB->GetStatement(
+      "INSERT INTO moz_keywords (keyword, place_id) "
+      "VALUES (:keyword, :place_id)"
+    );
+  }
   NS_ENSURE_STATE(stmt);
   mozStorageStatementScoper scoper(stmt);
 
-  nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), aURI);
+  rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("place_id"), bookmark.placeId);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = stmt->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  bool hasMore = false;
-  rv = stmt->ExecuteStep(&hasMore);
-  if (NS_FAILED(rv) || !hasMore) {
-    aKeyword.SetIsVoid(true);
-    return NS_OK; // not found: return void keyword string
+  // In both cases, notify about the change.
+  nsTArray<BookmarkData> bookmarks;
+  rv = GetBookmarksForURI(uri, bookmarks);
+  NS_ENSURE_SUCCESS(rv, rv);
+  for (uint32_t i = 0; i < bookmarks.Length(); ++i) {
+    NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                     nsINavBookmarkObserver,
+                     OnItemChanged(bookmarks[i].id,
+                                   NS_LITERAL_CSTRING("keyword"),
+                                   false,
+                                   NS_ConvertUTF16toUTF8(keyword),
+                                   bookmarks[i].lastModified,
+                                   TYPE_BOOKMARK,
+                                   bookmarks[i].parentId,
+                                   bookmarks[i].guid,
+                                   bookmarks[i].parentGuid));
   }
 
-  // found, get the keyword
-  rv = stmt->GetString(0, aKeyword);
-  NS_ENSURE_SUCCESS(rv, rv);
   return NS_OK;
 }
 
@@ -2436,17 +2483,34 @@ nsNavBookmarks::GetKeywordForBookmark(int64_t aBookmarkId, nsAString& aKeyword)
   NS_ENSURE_ARG_MIN(aBookmarkId, 1);
   aKeyword.Truncate(0);
 
-  nsresult rv = EnsureKeywordsHash();
+  // We can have multiple keywords for the same uri, here we'll just return the
+  // last created one.
+  nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(NS_LITERAL_CSTRING(
+    "SELECT k.keyword "
+    "FROM moz_bookmarks b "
+    "JOIN moz_keywords k ON k.place_id = b.fk "
+    "WHERE b.id = :item_id "
+    "ORDER BY k.ROWID DESC "
+    "LIMIT 1"
+  ));
+  NS_ENSURE_STATE(stmt);
+  mozStorageStatementScoper scoper(stmt);
+
+  nsresult rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("item_id"),
+                             aBookmarkId);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsAutoString keyword;
-  if (!mBookmarkToKeywordHash.Get(aBookmarkId, &keyword)) {
-    aKeyword.SetIsVoid(true);
-  }
-  else {
-    aKeyword.Assign(keyword);
+  bool hasMore;
+  if (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
+    nsAutoString keyword;
+    rv = stmt->GetString(0, keyword);
+    NS_ENSURE_SUCCESS(rv, rv);
+    aKeyword = keyword;
+    return NS_OK;
   }
 
+  aKeyword.SetIsVoid(true);
+
   return NS_OK;
 }
 
@@ -2463,51 +2527,27 @@ nsNavBookmarks::GetURIForKeyword(const nsAString& aUserCasedKeyword,
   nsAutoString keyword(aUserCasedKeyword);
   ToLowerCase(keyword);
 
-  nsresult rv = EnsureKeywordsHash();
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(NS_LITERAL_CSTRING(
+    "SELECT h.url "
+    "FROM moz_places h "
+    "JOIN moz_keywords k ON k.place_id = h.id "
+    "WHERE k.keyword = :keyword"
+  ));
+  NS_ENSURE_STATE(stmt);
+  mozStorageStatementScoper scoper(stmt);
 
-  keywordSearchData searchData;
-  searchData.keyword.Assign(keyword);
-  searchData.itemId = -1;
-  mBookmarkToKeywordHash.EnumerateRead(SearchBookmarkForKeyword, &searchData);
-
-  if (searchData.itemId == -1) {
-    // Not found.
-    return NS_OK;
-  }
-
-  rv = GetBookmarkURI(searchData.itemId, aURI);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return NS_OK;
-}
-
-
-nsresult
-nsNavBookmarks::EnsureKeywordsHash() {
-  if (mBookmarkToKeywordHashInitialized) {
-    return NS_OK;
-  }
-  mBookmarkToKeywordHashInitialized = true;
-
-  nsCOMPtr<mozIStorageStatement> stmt;
-  nsresult rv = mDB->MainConn()->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT b.id, k.keyword "
-    "FROM moz_bookmarks b "
-    "JOIN moz_keywords k ON k.id = b.keyword_id "
-  ), getter_AddRefs(stmt));
+  nsresult rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
   NS_ENSURE_SUCCESS(rv, rv);
 
   bool hasMore;
-  while (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
-    int64_t itemId;
-    rv = stmt->GetInt64(0, &itemId);
+  if (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
+    nsAutoCString spec;
+    rv = stmt->GetUTF8String(0, spec);
     NS_ENSURE_SUCCESS(rv, rv);
-    nsAutoString keyword;
-    rv = stmt->GetString(1, keyword);
+    nsCOMPtr<nsIURI> uri;
+    rv = NS_NewURI(getter_AddRefs(uri), spec);
     NS_ENSURE_SUCCESS(rv, rv);
-
-    mBookmarkToKeywordHash.Put(itemId, keyword);
+    uri.forget(aURI);
   }
 
   return NS_OK;
diff --git a/toolkit/components/places/nsNavBookmarks.h b/toolkit/components/places/nsNavBookmarks.h
index 6aeef4e66a5e..e5ac2fc9b803 100644
--- a/toolkit/components/places/nsNavBookmarks.h
+++ b/toolkit/components/places/nsNavBookmarks.h
@@ -421,21 +421,13 @@ private:
   // Note: this is only tracking bookmarks batches, not history ones.
   bool mBatching;
 
-  /**
-   * Always call EnsureKeywordsHash() and check it for errors before actually
-   * using the hash.  Internal keyword methods are already doing that.
-   */
-  nsresult EnsureKeywordsHash();
-  nsDataHashtable<nsTrimInt64HashKey, nsString> mBookmarkToKeywordHash;
-  bool mBookmarkToKeywordHashInitialized;
-
   /**
    * This function must be called every time a bookmark is removed.
    *
    * @param aURI
    *        Uri to test.
    */
-  nsresult UpdateKeywordsHashForRemovedBookmark(int64_t aItemId);
+  nsresult UpdateKeywordsForRemovedBookmark(const BookmarkData& aBookmark);
 };
 
 #endif // nsNavBookmarks_h_
diff --git a/toolkit/components/places/nsPlacesAutoComplete.js b/toolkit/components/places/nsPlacesAutoComplete.js
index ec1986a157e6..366ce144a04e 100644
--- a/toolkit/components/places/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/nsPlacesAutoComplete.js
@@ -414,24 +414,20 @@ function nsPlacesAutoComplete()
   XPCOMUtils.defineLazyGetter(this, "_keywordQuery", function() {
     return this._db.createAsyncStatement(
       `/* do not warn (bug 487787) */
-       SELECT
-       (SELECT REPLACE(url, '%s', :query_string) FROM moz_places WHERE id = b.fk)
-       AS search_url, h.title,
+       SELECT REPLACE(h.url, '%s', :query_string) AS search_url, h.title,
        IFNULL(f.url, (SELECT f.url
                       FROM moz_places
                       JOIN moz_favicons f ON f.id = favicon_id
-                      WHERE rev_host = (SELECT rev_host FROM moz_places WHERE id = b.fk)
+                      WHERE rev_host = h.rev_host
                       ORDER BY frecency DESC
                       LIMIT 1)
-       ), 1, b.title, NULL, h.visit_count, h.typed, IFNULL(h.id, b.fk),
+       ), 1, NULL, NULL, h.visit_count, h.typed, h.id,
        :query_type, t.open_count
        FROM moz_keywords k
-       JOIN moz_bookmarks b ON b.keyword_id = k.id
-       LEFT JOIN moz_places h ON h.url = search_url
+       JOIN moz_places h ON k.place_id = h.id
        LEFT JOIN moz_favicons f ON f.id = h.favicon_id
        LEFT JOIN moz_openpages_temp t ON t.url = search_url
-       WHERE LOWER(k.keyword) = LOWER(:keyword)
-       ORDER BY h.frecency DESC`
+       WHERE k.keyword = LOWER(:keyword)`
     );
   });
 
diff --git a/toolkit/components/places/nsPlacesIndexes.h b/toolkit/components/places/nsPlacesIndexes.h
index be52de66f989..0327960395d2 100644
--- a/toolkit/components/places/nsPlacesIndexes.h
+++ b/toolkit/components/places/nsPlacesIndexes.h
@@ -121,4 +121,13 @@
     "guid_uniqueindex", "moz_favicons", "guid", "UNIQUE" \
   )
 
+/**
+ * moz_keywords
+ */
+
+#define CREATE_IDX_MOZ_KEYWORDS_PLACEPOSTDATA \
+  CREATE_PLACES_IDX( \
+    "placepostdata_uniqueindex", "moz_keywords", "place_id, post_data", "UNIQUE" \
+  )
+
 #endif // nsPlacesIndexes_h__
diff --git a/toolkit/components/places/nsPlacesTables.h b/toolkit/components/places/nsPlacesTables.h
index c9a9637f339e..db1a2e67d618 100644
--- a/toolkit/components/places/nsPlacesTables.h
+++ b/toolkit/components/places/nsPlacesTables.h
@@ -121,6 +121,8 @@
   "CREATE TABLE moz_keywords (" \
     "  id INTEGER PRIMARY KEY AUTOINCREMENT" \
     ", keyword TEXT UNIQUE" \
+    ", place_id INTEGER" \
+    ", post_data TEXT" \
   ")" \
 )
 
diff --git a/toolkit/components/places/nsPlacesTriggers.h b/toolkit/components/places/nsPlacesTriggers.h
index 52b96f9c6007..00b6380b730c 100644
--- a/toolkit/components/places/nsPlacesTriggers.h
+++ b/toolkit/components/places/nsPlacesTriggers.h
@@ -175,7 +175,7 @@
   "END" \
 )
 
-#define CREATE_FOREIGNCOUNT_AFTERDELETE_TRIGGER NS_LITERAL_CSTRING( \
+#define CREATE_BOOKMARKS_FOREIGNCOUNT_AFTERDELETE_TRIGGER NS_LITERAL_CSTRING( \
   "CREATE TEMP TRIGGER moz_bookmarks_foreign_count_afterdelete_trigger " \
   "AFTER DELETE ON moz_bookmarks FOR EACH ROW " \
   "BEGIN " \
@@ -185,7 +185,7 @@
   "END" \
 )
 
-#define CREATE_FOREIGNCOUNT_AFTERINSERT_TRIGGER NS_LITERAL_CSTRING( \
+#define CREATE_BOOKMARKS_FOREIGNCOUNT_AFTERINSERT_TRIGGER NS_LITERAL_CSTRING( \
   "CREATE TEMP TRIGGER moz_bookmarks_foreign_count_afterinsert_trigger " \
   "AFTER INSERT ON moz_bookmarks FOR EACH ROW " \
   "BEGIN " \
@@ -195,7 +195,7 @@
   "END" \
 )
 
-#define CREATE_FOREIGNCOUNT_AFTERUPDATE_TRIGGER NS_LITERAL_CSTRING( \
+#define CREATE_BOOKMARKS_FOREIGNCOUNT_AFTERUPDATE_TRIGGER NS_LITERAL_CSTRING( \
   "CREATE TEMP TRIGGER moz_bookmarks_foreign_count_afterupdate_trigger " \
   "AFTER UPDATE OF fk ON moz_bookmarks FOR EACH ROW " \
   "BEGIN " \
@@ -207,4 +207,38 @@
     "WHERE id = OLD.fk;" \
   "END" \
 )
+
+#define CREATE_KEYWORDS_FOREIGNCOUNT_AFTERDELETE_TRIGGER NS_LITERAL_CSTRING( \
+  "CREATE TEMP TRIGGER moz_keywords_foreign_count_afterdelete_trigger " \
+  "AFTER DELETE ON moz_keywords FOR EACH ROW " \
+  "BEGIN " \
+    "UPDATE moz_places " \
+    "SET foreign_count = foreign_count - 1 " \
+    "WHERE id = OLD.place_id;" \
+  "END" \
+)
+
+#define CREATE_KEYWORDS_FOREIGNCOUNT_AFTERINSERT_TRIGGER NS_LITERAL_CSTRING( \
+  "CREATE TEMP TRIGGER moz_keyords_foreign_count_afterinsert_trigger " \
+  "AFTER INSERT ON moz_keywords FOR EACH ROW " \
+  "BEGIN " \
+    "UPDATE moz_places " \
+    "SET foreign_count = foreign_count + 1 " \
+    "WHERE id = NEW.place_id;" \
+  "END" \
+)
+
+#define CREATE_KEYWORDS_FOREIGNCOUNT_AFTERUPDATE_TRIGGER NS_LITERAL_CSTRING( \
+  "CREATE TEMP TRIGGER moz_keywords_foreign_count_afterupdate_trigger " \
+  "AFTER UPDATE OF place_id ON moz_keywords FOR EACH ROW " \
+  "BEGIN " \
+    "UPDATE moz_places " \
+    "SET foreign_count = foreign_count + 1 " \
+    "WHERE id = NEW.place_id; " \
+    "UPDATE moz_places " \
+    "SET foreign_count = foreign_count - 1 " \
+    "WHERE id = OLD.place_id; " \
+  "END" \
+)
+
 #endif // __nsPlacesTriggers_h__
diff --git a/toolkit/components/places/tests/autocomplete/test_keyword_search.js b/toolkit/components/places/tests/autocomplete/test_keyword_search.js
index 8691d8185873..c8ddc84a83ef 100644
--- a/toolkit/components/places/tests/autocomplete/test_keyword_search.js
+++ b/toolkit/components/places/tests/autocomplete/test_keyword_search.js
@@ -43,13 +43,13 @@ let kTitles = [
 // Add the keyword bookmark
 addPageBook(0, 0, 1, [], keyKey);
 // Add in the "fake pages" for keyword searches
-gPages[1] = [1,1];
-gPages[2] = [2,1];
-gPages[3] = [3,1];
-gPages[4] = [4,1];
+gPages[1] = [1,0];
+gPages[2] = [2,0];
+gPages[3] = [3,0];
+gPages[4] = [4,0];
 // Add a page into history
 addPageBook(5, 0);
-gPages[6] = [6,1];
+gPages[6] = [6,0];
 
 // Provide for each test: description; search terms; array of gPages indices of
 // pages that should match; optional function to be run before the test
@@ -68,14 +68,4 @@ let gTests = [
    keyKey, [6]],
   ["6: Keyword without query (with space)",
    keyKey + " ", [6]],
-
-  // This adds a second keyword so anything after this will match 2 keywords
-  ["7: Two keywords matched",
-   keyKey + " twoKey", [8,9],
-   function() {
-     // Add the keyword search as well as search results
-     addPageBook(7, 0, 1, [], keyKey);
-     gPages[8] = [8,1];
-     gPages[9] = [9,1];
-   }]
 ];
diff --git a/toolkit/components/places/tests/bookmarks/test_keywords.js b/toolkit/components/places/tests/bookmarks/test_keywords.js
index 193af622cb83..242fa4977e0d 100644
--- a/toolkit/components/places/tests/bookmarks/test_keywords.js
+++ b/toolkit/components/places/tests/bookmarks/test_keywords.js
@@ -1,169 +1,307 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+const URI1 = NetUtil.newURI("http://test1.mozilla.org/");
+const URI2 = NetUtil.newURI("http://test2.mozilla.org/");
+const URI3 = NetUtil.newURI("http://test3.mozilla.org/");
 
-function check_bookmark_keyword(aItemId, aKeyword)
-{
-  let keyword = aKeyword ? aKeyword.toLowerCase() : null;
-  do_check_eq(PlacesUtils.bookmarks.getKeywordForBookmark(aItemId),
-              keyword);
-}
-
-function check_uri_keyword(aURI, aKeyword)
-{
-  let keyword = aKeyword ? aKeyword.toLowerCase() : null;
+function check_keyword(aURI, aKeyword) {
+  if (aKeyword)
+    aKeyword = aKeyword.toLowerCase();
 
   for (let bm of PlacesUtils.getBookmarksForURI(aURI)) {
-    let kid = PlacesUtils.bookmarks.getKeywordForBookmark(bm);
-    if (kid && !keyword) {
-      Assert.ok(false, `${aURI.spec} should not have a keyword`);
-    } else if (keyword && kid == keyword) {
-      Assert.equal(kid, keyword, "Found the keyword");
-      break;
+    let keyword = PlacesUtils.bookmarks.getKeywordForBookmark(bm);
+    if (keyword && !aKeyword) {
+      throw(`${aURI.spec} should not have a keyword`);
+    } else if (aKeyword && keyword == aKeyword) {
+      Assert.equal(keyword, aKeyword);
     }
   }
 
   if (aKeyword) {
-    // This API can't tell which uri the user wants, so it returns a random one.
-    let re = /http:\/\/test[0-9]\.mozilla\.org/;
-    let url = PlacesUtils.bookmarks.getURIForKeyword(aKeyword).spec;
-    do_check_true(re.test(url));
+    let uri = PlacesUtils.bookmarks.getURIForKeyword(aKeyword);
+    Assert.equal(uri.spec, aURI.spec);
     // Check case insensitivity.
-    url = PlacesUtils.bookmarks.getURIForKeyword(aKeyword.toUpperCase()).spec
-    do_check_true(re.test(url));
+    uri = PlacesUtils.bookmarks.getURIForKeyword(aKeyword.toUpperCase());
+    Assert.equal(uri.spec, aURI.spec);
   }
 }
 
-function check_orphans()
-{
-  let stmt = DBConn().createStatement(
-    `SELECT id FROM moz_keywords k WHERE NOT EXISTS (
-        SELECT id FROM moz_bookmarks WHERE keyword_id = k.id
-     )`
-  );
-  try {
-    do_check_false(stmt.executeStep());
-  } finally {
-    stmt.finalize();
-  }
-
-  print("Check there are no orphan database entries");
-  stmt = DBConn().createStatement(
-    `SELECT b.id FROM moz_bookmarks b
-     LEFT JOIN moz_keywords k ON b.keyword_id = k.id
-     WHERE keyword_id NOTNULL AND k.id ISNULL`
-  );
-  try {
-    do_check_false(stmt.executeStep());
-  } finally {
-    stmt.finalize();
-  }
+function check_orphans() {
+  let db = yield PlacesUtils.promiseDBConnection();
+  let rows = yield db.executeCached(
+    `SELECT id FROM moz_keywords k
+     WHERE NOT EXISTS (SELECT 1 FROM moz_places WHERE id = k.place_id)
+    `);
+  Assert.equal(rows.length, 0);
 }
 
-const URIS = [
-  uri("http://test1.mozilla.org/"),
-  uri("http://test2.mozilla.org/"),
-];
+function expectNotifications() {
+  let notifications = [];
+  let observer = new Proxy(NavBookmarkObserver, {
+    get(target, name) {
+      if (name == "check") {
+        PlacesUtils.bookmarks.removeObserver(observer);
+        return expectedNotifications =>
+          Assert.deepEqual(notifications, expectedNotifications);
+      }
 
-add_test(function test_addBookmarkWithKeyword()
-{
-  check_uri_keyword(URIS[0], null);
+      if (name.startsWith("onItemChanged")) {
+        return (id, prop, isAnno, val, lastMod, itemType, parentId, guid, parentGuid) => {
+          if (prop != "keyword")
+            return;
+          let args = Array.from(arguments, arg => {
+            if (arg && arg instanceof Ci.nsIURI)
+              return new URL(arg.spec);
+            if (arg && typeof(arg) == "number" && arg >= Date.now() * 1000)
+              return new Date(parseInt(arg/1000));
+            return arg;
+          });
+          notifications.push({ name: name, arguments: args });
+        }
+      }
+
+      return target[name];
+    }
+  });
+  PlacesUtils.bookmarks.addObserver(observer, false);
+  return observer;
+}
+
+add_task(function test_invalid_input() {
+  Assert.throws(() => PlacesUtils.bookmarks.getURIForKeyword(null),
+                /NS_ERROR_ILLEGAL_VALUE/);
+  Assert.throws(() => PlacesUtils.bookmarks.getURIForKeyword(""),
+                /NS_ERROR_ILLEGAL_VALUE/);
+  Assert.throws(() => PlacesUtils.bookmarks.getKeywordForBookmark(null),
+                /NS_ERROR_ILLEGAL_VALUE/);
+  Assert.throws(() => PlacesUtils.bookmarks.getKeywordForBookmark(0),
+                /NS_ERROR_ILLEGAL_VALUE/);
+  Assert.throws(() => PlacesUtils.bookmarks.setKeywordForBookmark(null, "k"),
+                /NS_ERROR_ILLEGAL_VALUE/);
+  Assert.throws(() => PlacesUtils.bookmarks.setKeywordForBookmark(0, "k"),
+                /NS_ERROR_ILLEGAL_VALUE/);
+});
+
+add_task(function test_addBookmarkAndKeyword() {
+  check_keyword(URI1, null);
+  let fc = yield foreign_count(URI1);
+  let observer = expectNotifications();
 
   let itemId =
     PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                         URIS[0],
+                                         URI1,
                                          PlacesUtils.bookmarks.DEFAULT_INDEX,
                                          "test");
+
   PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
-  check_bookmark_keyword(itemId, "keyword");
-  check_uri_keyword(URIS[0], "keyword");
+  let bookmark = yield PlacesUtils.bookmarks.fetch({ url: URI1 });
+  observer.check([ { name: "onItemChanged",
+                     arguments: [ itemId, "keyword", false, "keyword",
+                                  bookmark.lastModified, bookmark.type,
+                                  (yield PlacesUtils.promiseItemId(bookmark.parentGuid)),
+                                  bookmark.guid, bookmark.parentGuid ] }
+                 ]);
+  yield PlacesTestUtils.promiseAsyncUpdates();
 
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    check_orphans();
-    run_next_test();
-  });
+  check_keyword(URI1, "keyword");
+  Assert.equal((yield foreign_count(URI1)), fc + 2); // + 1 bookmark + 1 keyword
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  yield check_orphans();
 });
 
-add_test(function test_addBookmarkToURIHavingKeyword()
-{
+add_task(function test_addBookmarkToURIHavingKeyword() {
+  // The uri has already a keyword.
+  check_keyword(URI1, "keyword");
+  let fc = yield foreign_count(URI1);
+
   let itemId =
     PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                         URIS[0],
+                                         URI1,
                                          PlacesUtils.bookmarks.DEFAULT_INDEX,
                                          "test");
-  // The uri has a keyword, but this specific bookmark has not.
-  check_bookmark_keyword(itemId, null);
-  check_uri_keyword(URIS[0], "keyword");
+  check_keyword(URI1, "keyword");
+  Assert.equal((yield foreign_count(URI1)), fc + 1); // + 1 bookmark
 
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    check_orphans();
-    run_next_test();
-  });
+  PlacesUtils.bookmarks.removeItem(itemId);
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  check_orphans();
 });
 
-add_test(function test_addSameKeywordToOtherURI()
-{
+add_task(function test_sameKeywordDifferentURI() {
+  let fc1 = yield foreign_count(URI1);
+  let fc2 = yield foreign_count(URI2);
+  let observer = expectNotifications();
+
   let itemId =
     PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                         URIS[1],
+                                         URI2,
                                          PlacesUtils.bookmarks.DEFAULT_INDEX,
                                          "test2");
-  check_bookmark_keyword(itemId, null);
-  check_uri_keyword(URIS[1], null);
+  check_keyword(URI1, "keyword");
+  check_keyword(URI2, null);
 
   PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "kEyWoRd");
-  check_bookmark_keyword(itemId, "kEyWoRd");
-  check_uri_keyword(URIS[1], "kEyWoRd");
 
-  // Check case insensitivity.
-  check_uri_keyword(URIS[0], "kEyWoRd");
-  check_bookmark_keyword(itemId, "keyword");
-  check_uri_keyword(URIS[1], "keyword");
-  check_uri_keyword(URIS[0], "keyword");
+  let bookmark1 = yield PlacesUtils.bookmarks.fetch({ url: URI1 });
+  let bookmark2 = yield PlacesUtils.bookmarks.fetch({ url: URI2 });
+  observer.check([ { name: "onItemChanged",
+                     arguments: [ (yield PlacesUtils.promiseItemId(bookmark1.guid)),
+                                  "keyword", false, "",
+                                  bookmark1.lastModified, bookmark1.type,
+                                  (yield PlacesUtils.promiseItemId(bookmark1.parentGuid)),
+                                  bookmark1.guid, bookmark1.parentGuid ] },
+                    { name: "onItemChanged",
+                     arguments: [ itemId, "keyword", false, "keyword",
+                                  bookmark2.lastModified, bookmark2.type,
+                                  (yield PlacesUtils.promiseItemId(bookmark2.parentGuid)),
+                                  bookmark2.guid, bookmark2.parentGuid ] }
+                 ]);
+  yield PlacesTestUtils.promiseAsyncUpdates();
 
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    check_orphans();
-    run_next_test();
-  });
+  // The keyword should have been "moved" to the new URI.
+  check_keyword(URI1, null);
+  Assert.equal((yield foreign_count(URI1)), fc1 - 1); // - 1 keyword
+  check_keyword(URI2, "keyword");
+  Assert.equal((yield foreign_count(URI2)), fc2 + 2); // + 1 bookmark + 1 keyword
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  check_orphans();
 });
 
-add_test(function test_removeBookmarkWithKeyword()
-{
+add_task(function test_sameURIDifferentKeyword() {
+  let fc = yield foreign_count(URI2);
+  let observer = expectNotifications();
+
   let itemId =
     PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
-                                         URIS[1],
+                                         URI2,
+                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                         "test2");
+  check_keyword(URI2, "keyword");
+
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword2");
+
+  let bookmarks = [];
+  yield PlacesUtils.bookmarks.fetch({ url: URI2 }, bookmark => bookmarks.push(bookmark));
+  observer.check([ { name: "onItemChanged",
+                     arguments: [ (yield PlacesUtils.promiseItemId(bookmarks[0].guid)),
+                                  "keyword", false, "keyword2",
+                                  bookmarks[0].lastModified, bookmarks[0].type,
+                                  (yield PlacesUtils.promiseItemId(bookmarks[0].parentGuid)),
+                                  bookmarks[0].guid, bookmarks[0].parentGuid ] },
+                    { name: "onItemChanged",
+                     arguments: [ (yield PlacesUtils.promiseItemId(bookmarks[1].guid)),
+                                  "keyword", false, "keyword2",
+                                  bookmarks[1].lastModified, bookmarks[1].type,
+                                  (yield PlacesUtils.promiseItemId(bookmarks[1].parentGuid)),
+                                  bookmarks[1].guid, bookmarks[1].parentGuid ] }
+                 ]);
+  yield PlacesTestUtils.promiseAsyncUpdates();
+
+  check_keyword(URI2, "keyword2");
+  Assert.equal((yield foreign_count(URI2)), fc + 2); // + 1 bookmark + 1 keyword
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  check_orphans();
+});
+
+add_task(function test_removeBookmarkWithKeyword() {
+  let fc = yield foreign_count(URI2);
+  let itemId =
+    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                         URI2,
                                          PlacesUtils.bookmarks.DEFAULT_INDEX,
                                          "test");
-  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
-  check_bookmark_keyword(itemId, "keyword");
-  check_uri_keyword(URIS[1], "keyword");
 
-  // The keyword should not be removed from other bookmarks.
+   // The keyword should not be removed, since there are other bookmarks yet.
+   PlacesUtils.bookmarks.removeItem(itemId);
+
+  check_keyword(URI2, "keyword2");
+  Assert.equal((yield foreign_count(URI2)), fc); // + 1 bookmark - 1 bookmark
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  check_orphans();
+});
+
+add_task(function test_unsetKeyword() {
+  let fc = yield foreign_count(URI2);
+  let observer = expectNotifications();
+
+  let itemId =
+    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                         URI2,
+                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                         "test");
+
+  // The keyword should be removed from any bookmark.
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, null);
+
+  let bookmarks = [];
+  yield PlacesUtils.bookmarks.fetch({ url: URI2 }, bookmark => bookmarks.push(bookmark));
+  do_print(bookmarks.length);
+  observer.check([ { name: "onItemChanged",
+                     arguments: [ (yield PlacesUtils.promiseItemId(bookmarks[0].guid)),
+                                  "keyword", false, "",
+                                  bookmarks[0].lastModified, bookmarks[0].type,
+                                  (yield PlacesUtils.promiseItemId(bookmarks[0].parentGuid)),
+                                  bookmarks[0].guid, bookmarks[0].parentGuid ] },
+                    { name: "onItemChanged",
+                     arguments: [ (yield PlacesUtils.promiseItemId(bookmarks[1].guid)),
+                                  "keyword", false, "",
+                                  bookmarks[1].lastModified, bookmarks[1].type,
+                                  (yield PlacesUtils.promiseItemId(bookmarks[1].parentGuid)),
+                                  bookmarks[1].guid, bookmarks[1].parentGuid ] },
+                    { name: "onItemChanged",
+                     arguments: [ (yield PlacesUtils.promiseItemId(bookmarks[2].guid)),
+                                  "keyword", false, "",
+                                  bookmarks[2].lastModified, bookmarks[2].type,
+                                  (yield PlacesUtils.promiseItemId(bookmarks[2].parentGuid)),
+                                  bookmarks[2].guid, bookmarks[2].parentGuid ] }
+                 ]);
+
+  check_keyword(URI1, null);
+  check_keyword(URI2, null);
+  Assert.equal((yield foreign_count(URI2)), fc - 1); // + 1 bookmark - 2 keyword
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  check_orphans();
+});
+
+add_task(function test_addRemoveBookmark() {
+  let fc = yield foreign_count(URI3);
+  let observer = expectNotifications();
+
+  let itemId =
+    PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                         URI3,
+                                         PlacesUtils.bookmarks.DEFAULT_INDEX,
+                                         "test3");
+
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
+  let bookmark = yield PlacesUtils.bookmarks.fetch({ url: URI3 });
+  let parentId = yield PlacesUtils.promiseItemId(bookmark.parentGuid);
   PlacesUtils.bookmarks.removeItem(itemId);
 
-  check_uri_keyword(URIS[1], "keyword");
-  check_uri_keyword(URIS[0], "keyword");
+  observer.check([ { name: "onItemChanged",
+                     arguments: [ itemId,
+                                  "keyword", false, "keyword",
+                                  bookmark.lastModified, bookmark.type,
+                                  parentId,
+                                  bookmark.guid, bookmark.parentGuid ] },
+                    { name: "onItemChanged",
+                     arguments: [ itemId,
+                                  "keyword", false, "",
+                                  bookmark.lastModified, bookmark.type,
+                                  parentId,
+                                  bookmark.guid, bookmark.parentGuid ] }
+                 ]);
 
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    check_orphans();
-    run_next_test();
-  });
+  check_keyword(URI3, null);
+  Assert.equal((yield foreign_count(URI3)), fc);
+
+  yield PlacesTestUtils.promiseAsyncUpdates();
+  check_orphans();
 });
 
-add_test(function test_removeFolderWithKeywordedBookmarks()
-{
-  // Keyword should be removed as well.
-  PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
-
-  check_uri_keyword(URIS[1], null);
-  check_uri_keyword(URIS[0], null);
-
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    check_orphans();
-    run_next_test();
-  });
-});
-
-function run_test()
-{
+function run_test() {
   run_next_test();
 }
diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js
index dcbd89dfc0e2..411a75d28acf 100644
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const CURRENT_SCHEMA_VERSION = 26;
+const CURRENT_SCHEMA_VERSION = 27;
 const FIRST_UPGRADABLE_SCHEMA_VERSION = 11;
 
 const NS_APP_USER_PROFILE_50_DIR = "ProfD";
@@ -851,3 +851,17 @@ function checkBookmarkObject(info) {
   Assert.ok(info.lastModified >= info.dateAdded, "lastModified should never be smaller than dateAdded");
   Assert.ok(typeof info.type == "number", "type should be a number");
 }
+
+/**
+ * Reads foreign_count value for a given url.
+ */
+function* foreign_count(url) {
+  if (url instanceof Ci.nsIURI)
+    url = url.spec;
+  let db = yield PlacesUtils.promiseDBConnection();
+  let rows = yield db.executeCached(
+    `SELECT foreign_count FROM moz_places
+     WHERE url = :url
+    `, { url });
+  return rows.length == 0 ? 0 : rows[0].getResultByName("foreign_count");
+}
diff --git a/toolkit/components/places/tests/migration/places_v26.sqlite b/toolkit/components/places/tests/migration/places_v26.sqlite
index b43dc2389e4a17471bc01ae421f9521fbc2a0afa..b4b238179736aa64b22329e9c8ef3b2a69d3effc 100644
GIT binary patch
delta 176
zcmZo@@Mvi8m>@04!oa|w0>m&NH&Mr!m4!j~8AoGEYYJm)3e(mU=57C&{69>W`OmD!
z<^O?!l{0<iGax_YKeG`?yyHK!Ify>^pIH-0zWvL8W*}w(Vpbq#17da{<^W<&Am##M
mZXo6XV&3gv{`38*7x4eU!o$MA#tE~ct%1L-L10;fU;_XSElEiL

delta 176
zcmZo@@Mvi8m>@04%)r2)0>m&NJ5k4&m6<{J8GB<&YYJm)3e(mU=57C&j4w==`OmD!
zWqg5wl{0<iGax_YKeG`?yyHK!Ify>^pIH-0zWvL8W*}w(Vpbq#17da{<^W<&Am##M
mZXo6XV&3gv{`38*7cjoS!o$MA#tE~ct%1L-L10;fU;_YJ{6{GO

diff --git a/toolkit/components/places/tests/migration/places_v27.sqlite b/toolkit/components/places/tests/migration/places_v27.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..57dfb75627d10e9a246b91573ffcae357b574f0c
GIT binary patch
literal 1212416
zcmeI*d3+Pq!tn8I%~G1OTM&hSY!$jM6p)K8Ep6#aX%V=3Ynn{c&?Hl`khUyC0TC4!
zTo6~#tGMEZ__$xVh%1PS2)LjqDy|@UMO5^iNt)6YP@m_1KJQiUZ=h%9?B{&voXMpB
zbjsvnr(dwtie9(XZ%I=vP-!%(vn>{tN~M*5hR8pWV}N|2i$vtJTK?(RE`Fj*tt#Oo
zqj}!Ls=@W=spc=7_vqZm=lSOBntNgMrlv#9bDR1!J=XYa@U6y6gX-Ybfpz{$zrnZC
zm*U;*ojU7{S!Xpo(vU1ZCH}>8w<p8>lsn6{!ljcN;y?fa1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#~Ea|*N!9&Cu4JVM<v-RZFljc&2ITK;2OZeO+4;}LzKYpdVyb=Cy@!ih=@
znNX3JU72U8DlME`m1ij|&CQ!;`Sn&TWu=`<S%xbeS3B(^ElS_jZQaUA@hx4?FvR5#
zP`Bi@4I(_i2A9<)v=!}`IrwB_J89L(utEha!$XaqY(xVF8RDi7QMZ(|by_bp1x2sj
zR~@R?Ao~1vtKV83@Hl4$j^Ra0opG|!MGBm}naD6BCEJfw>9$(wH@-zP&=6NROx-fD
zZG<(VSnsxa>wVRZfYaW2WNo>FPByf*635k#45_VzWw_Es{A`OMZo)uyOYgQZgm6wg
zfN<8pll6X*nvt%<*{%Kh1{mV9<$k+&?l<6db)I)?#b4>RQ^n4`%GvQP-TNEjrpV$M
zZN0X6gtn5)>hrrryR+6Q*pDwVpmhYtHqo!tj*OwLm}Piv{YZ<_OG#@l@$*hM#En16
zB51IB1&{yuf%N}{fwZf0g6_k)BQ5eObo!m5Cw|sxhPbhE_vYh!35gt^eEKhRt~?<^
zHBQjAGIM`ZgAm`M?I*9fr1tB+&gt`u-lo}3c~m}ScO2V}9kNb4uI~=n$7)9U?~rX7
z9_k=eN*=|jzdVXsuNa<-^0e&GPQPCnMO)32j6%t;4h<!~C9ba_u0*yN-v-^GtMD`C
z<RGX1%1}aEr>*))#uF+OdW^R7ncqi#pvxQd*uyEj4Xc&a8!Fe<tO69y?0ejBPFg84
zmT&>faHZKWO8EY`;|y`*<o-=<Fs)71dIg){u{Cu{?{l)QJCyI-Ya}y%<|&4_Q77sy
zG*z1z@W>B_$TZ_l*4MGZojVH4hT4f2dK=<0<i6CMrchlce>QYVJLP0uwUzDMlUJA>
zYAD{_OWxXYH(fe4SzT+L?X-!WPRYGb)>Hf9ojYsIQ(ggzdg|kb3{n5pZ>@0&zF98$
zSy1isTm32RuY0w2Qkk7ooM&mDGu&U}8tJq*j#TQzFFd!0A#TJ7^<pv9T&EY7PSKtn
z8ts&68E&yS?edFHWnO+>g{8cruq3-;x}_*@`bbOb3r$;QX<4PEw5quH1aCNzG9xW+
zr(3929%PoO*%cECvMYwCrN&!w^Co6j6-TPex_<e|Z7D7*&2KF=(o*ZPI((6K+A1WE
zv<Qt2POnvY9G@sR)Kz5ok#6K#%J$2)+l6CuYnR#nBj)%<;};fnH^dDXpk6Gr@miJl
zNyRR7(c?JMQ1UNfhPJ1?5Zb!?uhDGj*3}S~mZomW@1S|?4Y|#=T~fCb3b!lpOV%E%
zyW{d}eZ7y6$LDp^$4yUDt3rFcb(>iOelZlUj@;&Uy;Y~2AhCN(lG&ha>V*T_X4bmn
zLsN=e#~wGANX{=!LVhD_zd>5RqJ$Q<)sj<OmUEK5)?vdaJ8Yyyd6l(P=1r@N9~G;Q
zD;n}k6ORlnJmW~LYk7=bdEiVBO*Hag667xi9$VYftTk%xFx^gNhb#AHq)(U?-_k!i
zgx4aq;YGd>DAtkdE*)BHpL23NOLkRdSz)PMvm~#ya-^lTtq?(*W9JPSdg}{+_h_~1
z@@rO+F@~)ov6vQvF}&b2+Gf`Fid*d!MSo~@bV@QEH_uK5l<6v!t2?ajl+5_H8P$p|
zyWnm2jET=P{n|S3)Jb?Iof4xL_AnUYh7D6MvK>Dm<&LzKH=cYFC%;?a_uj~JQT`yP
zk6gEX3WPs(!f)r1%wuoq$5Q-Gze{MpYufI8I~BQyFjVNHL)jK5__XNwHRM<i$F@?-
z$f(eV#KK{1D9TGm=-!4d^v7X@l79(8DG*+zkw?|Bo7?(ccWfxi@Q?pEX)}{Q0~@?T
zt+O$_np5=pxV!<swDUuw3on4srJ*HLYluroP%j+NHbbYUA>eO)1y}BT`?&77`L@qh
zrrmkVSt7HP-!+tm+uyl%c>$kL9eOo9HurY#DeZrI5Nahpe!NZ}Hznbh=GuN_;VHLI
ziIRU=rfbR97~+zW)C<S8&A!8T4`uot612z7zeDyf-S=Z(d5%r7GuB8;_$66+u{l;M
zoYwv&Xr#p__<Zf&mf{!AQ5)h04pd)|-8Pd@<DsP*zS0~w_Heo~=##!5cKU>p_wn)D
zFY>zG{?<lj(&3)AU$=Em`Ni!7Z+q?5M90P7_G;IzMC(Ua$Bo}<6SZ}kkkYPZr|()3
zY)iWjQso)q6`T%F$A#I}UUFM=@n(53#Wr_WNw-TS^AF5lIe+5(?(^o)%bxrCTyf66
zIStK^$(bAoAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1vK
zf3rZ#kl0vNi`JKBG8)xt{SafF-{0UHlayq&+eMErQU1f?PM6D?D0&@9PJdFZQ~oRN
zVq-Wr$v4a8^a}}YtH<gPyh&3g7t2vgNjPd5GsZGObT^0|!Q*#YtPY1WAYaUOS{eke
zWn#D?hgVFrx?Ij?(Vgh?h<3X*(P&pi#ZE63)^Dhtn3tVDF({_zmKV3Ao8@tqmBn`+
zXD}E{bcmwEB_zt@^9fe3t#16Rap9qjXdT*6r!X$yuT97rDn>3GL0`4kKF;PHDmcew
zWfW9SEuNB|Q(9xSHlzg|rH-6%3zpUvED4qgg4brX*hG&dKh&S!nJBoFt`n6p7(&A?
z*|+&%RZ)Fe{e)_vwydVW8zYa}tQui58CC6d+l|^Lx_|qy-J-31r{O-|Ue?$+tuE7%
zUEs>8EAg}#yO>pT3KLEw)&6!0o`k9?ZFkh;bkzA>O-kJ7_Xa#kt#`;$8qQGen9pyi
z2zV^z^4)HK<CMwhe^%~VarXtgQru#GL%C2}l$ma`MVnQkD&a)4Z$A>b&(NwmZVa7!
z3C*`SdeQTv{mr9%sR?ENTxVLn$*huoy^{v7I8(6seQh&N%SuePrW~8_2|Ft~nm4?_
zndhj>NzWB$+N;MJ&8o>Nl~KN*M%55g=nvD6QU3n>xXhtG(d!?Vl0MXJZLAP{0hix5
zE+yGhGP|&Pf_HNDgo)mkZU%WdG<B|CE4u80cU(?cSy4%LMbVV%lDyKYp{=P^r4tK_
z^Kz@(aw8d)Wo5-V*%d=)1q5$Xr80t)))Az39Kleb(dG)+g~@V3ry!3hqe7@jX>!))
z%`BOcrZ=myI}a!{k*tobBoqYeE1L7p$tbU%TpndsRjCq;@*_hdBSan<$~tI&Tf+;?
zS|bMhNu6<Zs%16eq%>P&Ughjb8I!7XW>xiXZBgEWey_78;1`Z-R;yYT6ef+HFg;I5
zom!oKuGXw_|JG(BtI!tk`9-(0`S{i~s%06alSWM`pOEdIV)ISam{qn=>!x34h_qfO
zxEhWdwrbgoinR3RX=46_+}Xl(wOQp1wX6E=?b_t0tk>!~LDRD{OI_Z8YsTpE(p0nj
zS*MpSS4m$=Z%NNd>!n-d2nPZPAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000RG6fo^((%Ba?xjIpYy*y*Lh`VBpz3@Wu+uQuw;N>a(b
z%?I_}bgiXgLP>8gYwV$IEv4zABo%jGuq&#&#-K7OHKRjG(Tkps>ZWe3Xi}1jj^+(F
zEAw6OpPe+lBY*$`2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000Iag@ShflRtB)(KRpWiM*sl?5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0;6E#1mb=$U_o$@Lq+Qap@&yM12q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*u&Z-Kr#y(&d*R9WqI
z(c?>Wi_K1#%bF;99rkWoy=s7*<q$=OOGtG3?cFtc)xcvZHqmYGsn)B`&=^(iDyo)6
z%X8LAPpPC&q&KB4@&yM12q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*u2G=W&{878;b>~y)TiK5qG)(%iRMA6|A5}kf+tae}|W)t0-
zQ?w~+tKBYoe2ML<=*;q*yUu-7CGC)Il+Kru=O3E?=={0!|1w`a@A-LG&HL-T)8>9C
zXLBHc00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb`N{
zSYSlg7?oP3R?9=w>xXDH8dX&6^rGS&$&qt;Q&w5Zw8BhZxjmQ>8>2F*)uuB-g^ijD
z!6tb8mP)I`7cRc>&hUBb`O^bpMeaG%ldXZq<Z<RuHDg++nxVCttI3ihiuG=*w_dP^
ztKDY_pVuGEbTt>&Wi|$?9n}q)G2!Y%Le=%!64B?kOm+I4{z$zQ4}|NjDGzung8tDH
znoFJa!L%-+dg{|d^`Z>g>>4rPw^W74I%(s<P^C#b8l6ouo6c#PmS?pInWLh^mBO9r
z44QnwZz=T57G1Mjdz*Cm@NmU7E6daBt&PEyimd!#{#a9}qA4lVo7ONP;PZ=aXR~0L
z==2J;Vq>^cU7zrI&gz23vKcO4)of2`S?XEF@Dx)*l{JO}!PQ`~dhC|UfM4`Ft*+KF
zCoBlpuDqhG-s!3gR5TT3xiZEW!uN1QxVA<X3jHnnjy=bo9j?3a;N+<l_Mme{kvO{0
zo~4(2HmObFx>|X*ey7J_nc}y4BfNzl6ohIP9@-zA&@`&CeAeii%%ZHbqLf}u>eex9
zt2{nYsnd2>Lt~zFWa)R|+T*hVo?53%uvaTbqApy!ck7rVYba7)Is4^x6)G$TW3-|2
zt-PAZ%JEq$MbTAb^(uWt>J}BRc)%Y{4pkqe3Dq^mhx<BKw?yy+I#%3~?3U9aoyMz`
zibkV3T(Nyor7y22`Xfc<BC06qIhFJ;=`(4M^tyb>fdB#sAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0z#mnhOO&>sI^d~wx&(WaQK#*#
z_FEl3T^FsK>=#8>jn%6)YUE_M;0b6<YHeRrgUf0Ye9`iZqoge=>9F*Lv`^Y4UveOT
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q5r>
z7U-hwrw({(oi4#1rCj?((N$yhYK_|7YQNRt)0wn=O${!qP4Fp6Zow1Kn3WkX_(M;d
z!6SeG0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAn<PsL@O;U__v#(0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1pd$hW@YpX{?Jok@CYD)00IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2>jauX1N99%r&ZcTjs26vImoW_coY3iE;u5
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfWRME;KC@QQ59TPGeAG2&hKyVjY&$f+U=sp
zmuRzl65V36)8(=zdIW!x&u{fRZAnhIBdOLp+i4R$iE?mJd1<~m`qXHdz+706TOpsj
zDL+QN91i&UXRCbD`Em*?jq)+qXkRMFO$`OpeRBDo%8xo{_zjJ6VqbsWH2)N_)*rNb
z1ywK@OmuqceKu=@kSKZ`H+*^4sVbG`&cfX6%B)K-y{f40YDcdns}9_7;3Yv{GV{lb
zi&C!5iJE+o`Mkl`oxS6N8Rr&sKX-kvhxWggcxqs0)p>nidq1ba7B^^D?eY?5MX#C*
z`u5(svOMoIp?K`#XVT+rsXyC4TJ`hT#2!gmXZC;j(70_)O{4QKG9I|Q@pAXn?k~Sr
zm%q0>rs(<LMSCn?=h*g)Hs5<`)#0BH?nqj-V`utRNgwr@bko>f<L9pFU-z?RLxsos
z!LpwRys$<5Ze!Z1_sm$IlkwzzuO8554V!mu#nG28Ins2owPpDe=d9S2{Nq=FOPkXc
zHD3PC-_sqNU)7a=w&Td0F<o<S%1W$0{hK>}TD43weCt2n-=C=VpT6!B?WzHu-Q`n?
zUX9WvZu{bem$HVr-szKnk5RQfZOV^<quZVv(s$|KH-CNBlKwa9dp+>@*_P#xEy&8&
zjkzIq;AN-uJn-P9Z{FE5ZTgOnHov{Sr>f=9gCBn1`~2Ix8|q&g_hen#v-f4CjQQub
zcL#j=gMW_g!c&{F<{tXzHLHGHIC5giV-weEa;IiZo>Fqt?xA-rpDfKzoW7=4(Zt2?
z^gNOhIQ*04vV~vl+EF_o>79`Q%X^zo?Nf4Dt)upi%T@o-+@kisoREC;=^HP}s5xUv
zLEk=WCx3d4cGl{I??zXvgFT*V>AL#y%ih}f#_4P4JoRQ^%uW5bZQZu5aBg*d`Umgk
z#OK|9*Pt~!_vQ}QjXq^)WkXWN-$wR2bn4ctXXPE4{rQ0hzy37yhE2DAGw{Y9r+0hs
z`f1ZME_h+u$|q+_eJ^nBe(Wx9$y2)?F`K7qHmx83le77)fiL`Y|640fug$HToPX>1
zoBp-#NRs-+5ua~(IccVCo7Y!)_soh#J#YU<w+GL>sVV*FSKkl4+;ZUHx+8VBj(XJC
zZT!p;(b)^CdKWuRd1Z;;WQo~#!<<n=UtUspM0a+6<B`W_e7*0D15^H`dh<@heFcYo
z3wCAoKC<f0>*a;5D$Fa*y)Wndg-*BCAtW_;9IB|;j|NQb*;t-6(=%ySW>#Ic!?kFd
z!Kf-*lH6_|Dto{oiVl~M==A?D_ndlqc&FUHeO%F|v-=nh&Rut<<(k>$=k^-EFg9w~
ztLsOvozT7Lu0`+lTR7FQ`OLbt(dUi)uHu%bTP#z5NS$`i@}k#@yhol`|DsS3cy#ZV
zH-CKitmob-RNs1m{hBv=<-EG}imDl1x+M%gI^@W(K~3&&iYE_V7jxGcOFnx@`=#cs
zk574aXUV`fdKScu-170Xeow4zxN*<!o6l?1R4?iB(Ds?z9H|KpyS_90B@lPrJ*Ar;
z%;>pIe0zLyaKi@I`8AtzrE{PA^7cz#9kOZs>TVY=&(mHsK_B;B;Iwxa<P2Z9z1Q`7
zZ~f-|^Ut4pxNGs664xmsZ}Y~y)U;%1;H&RnPFdNlyLwud_0dM}EB!vZ*F403b-&Z*
z<b8E!)ap0)6`Y<jF!?&+`4w|jM-2Tw)IZno&~{Jq#980&w><Re2SdKy9B}m>`TF>C
z-#%ybWuoizICt*UXY3c0|9CiU$B@x?Um#rb#uNI=8O#4Z<GX%$E_=73Uv}0{C%?7*
z?mIiBAahb$rL%TILW%D}i{7Ma>AkG6-My6`tnyRsxM!?eusf~cN37E;)QXMmZ~OSv
z<dn38<gDND$kiMT-~P4R=M`_6b(-Pe<sZe5`D|)QS@68zJn2Jc%wsEGT~sjoJm;qm
zjVU>Ajj;B%v)1<++Fht0ckh;w3Aa{G`)m3W^@+B-rd;g}o_FE$^q#ffKXr7Id-_jb
z|Mc_GH$T4o@P+%OVRr?}uYUb66)SfA<jFnSaP>L$&wcld;lP&bGkvq_*1mjnRbJ84
z=lJbMj_!NU`;Klzld<X2*zDlDmV3X@YG&MPyf<z2<LeGgDfwdarrdPfq$3yQym!`}
z%ZvMu^*5wujPJSrn&{l#{TDyC{x6NAR_-kyWt@Cb|2g&k<Wv9pYSV}#dwQ+T{^aQ+
zw_m*R%8eVF|7lp$!?f=)$KJ`WFP&aB?t%OFFR^7CRt%W=%y)Oju1dJzfter2yB1__
zT-TU&fwghGp}xOidwl%g?7H_W=AU|F^urA=)Gzw1Wo$#yV;5h%=7tUX`^JpF_3O;l
zqY7&>?i#&vd)Bgj4UKcMms}M;siAM+;1<`Cm-c+t?amidMjblM^KfO$&(kh`y7syq
z`m-+SeRS?qmu$Rk@A*qVxFYTm{Yy1zDdV5kd|f51Ts!=k8(*2bW%(T+JojDIL0kSS
z=RS7xut8%74SH?FGgoO-VkTx>`11MHuivS8AUWB5^IH!+Fl2O8=?xDJoOWIG{X5Q_
zJE!l$Rkg9(>fagaic8lQK5p(Fv*^K?`zvGCRL0()cJ%xgKWq>$PwMsJaO2VUuef$y
zZ1vc;Q*H_7?wqyrlzt6Omk!SVN6Rf`8<TIV=`-p4JNG=SOL_XIZbh5+4tgi{u3)$3
z`=3vqdZ6W}?Ry@5@Vwct>jy{cN`q4ypOT*ZYE+Ns&VPIBEd!fP->&^vzV*8^r^WjE
zBwVra#;vd1cJQMCuE5(_LYKV1ynoZ$O9nqVU%P1FLaSwob@<I2@2u_fM)I=T(pFyC
zH)c}zcl!?-GwPk|<LVawbKTB)x4paGyX206F-zPrNrU=+A58vcc;8Pytoh5<^U4cz
zxBv7^@t_$ahdlB2NQZT&aMAwyt5&W2$5WNhoRjeFcittB#SFh7_V(O|S1kSf4((6R
z+`Ke5_u-3|F1%>?)k`%?3nu1jzW;3be0856E?NCvOZ6is-J++*ep%jBKBc)({+zF#
zo>g_BI!fN6=4Cnm#uiOT8J(FZKiz-J_Iy9QJukSbzIf}bKF>*4zZAQDndgqzUijqj
z5BF~!`p5@YzSQl(sn@+YZffDfr*2yD*u4qYKKtxS>yr=kO&UHmG2iz>)~V*@(-)V1
z{N`O}Tzl?{J}*Ca$@L%gSar^}OAZ`f=h*hG@zpK{S9Q<KabN!U<cD8<eA&FRvCn?H
z;)g{-)!!zr3R+X=6x==YjJxhOU$uMFGifFEcbmWX!O`^3TV{Oo#64e)-@V~~o=~qm
z^C|iN{t-7W%d!obE1KudDZ6k;>Q~pkzwY+Cx2G2Vz3K1oe>hnyCg#3!I9L1A?Nfg&
zTKmnoSI;ge%<#Sy`1IbSy_fVpZP2H8tj>6MzwhG_*LUf?cFwYgtCyX>_2zf_T=HVy
zx!(;`|8SstWkt!pHTUQo{h#~z<s~bw`LWld>juBPBl@sD@1@um?z!rW#^A?U+k-bw
zsGfV(>h-;2UK*Fz@VCB?FSEV!NY5MRJ+4dmYt5QBPboV0vFM#ME^w^-=bVPY*-Z{p
z!th}aufB2bJ*9sy8oOb^Gd=b^EbV(@Sl6dtuh};0@x^zP7deZs&3dTU%V%xAy^s04
z_Y;47t?O&z-tONgoR#zQ;xE2g_24zxvp#!t?)-6&244AFLH%{=y)VA@@{VDJ*Pl{&
z+V1GLyqE6mcgCxm<8Ha3YReVZZQlR>C4G9_u<4bRLmsaBw5jTpjlsVT7<1p^kD>=I
zzVoJAzH;6C%p;YrT|IEtDgM(RzI~eYvWjO)N^Fg;*p}rlJnR{DaAS{xAJ#u`^BFUq
zjsLXA;H1|cAADKwi?b#S+H`BhtNC~ItSuh0<%%s&U-RITYnN_#LK?jFv1j{lywq9q
z-rBEDy}UM9w4&hi=@*af`*-8(+XiNx)pzHZ&39~?{OB7aPCIh(_e~GwTNZcwsP2<>
zE7SXLdA;%aLCzVktiN>Jl)cX{PrrZpu64b?-BNe+mZNLmE?K&}Pf69i6SvwgeSG?r
z!wRqb_^vCT^%s6Hw{YIY``+yHNza_c-+mjrH)rYS+W5!DOqw<4%4d%@7H;j8x7EJ+
zi&=NC8~b(jkBhshbCz}+nA>pp^TYr1Ue_&wN49?87;)jr_n^-5Kt;yra$BjhxMWs(
z@!}Mnya%-xj%?k7@;4FX4Jh&zME<x;N=;7ANOD{4LPDS+q4i5hQd&YvdTLrqMoLCz
zN@i-tZ`gh+eN9n*uIgvy-|DCCxJn*k>sOL4JyohMJ=Ln~Z|ox{8vKPNd4@ePF)>|w
zMy=R4N=`c6Svk!=L3FzXk6)RYYJyj=`USfs==9fF@(WAK?TLaxrBbJdcKA!1uY9mX
zJGoo#yCYW&Ty2`US~Y6Hwt}Y@T)jXuye0Pe<(7&6v}AoUXpnd20?nNpc8%2q9iMNy
z?Sb9%x32nm_P3j)YgHE)I^R0~ys10hX-bJVFWC64yJ~CcWkWx7?%J7q_Ryt=?|5!^
z%d;PRvS{}EE7PAfW{f(cp?2ris0rPot^EqKzRnmqGqvB1#$^Njdv6zYmVxQHnn!1U
zAH8UM!K|z+KHgUMKLcO3KX&lW`y5HCyva8YYT5dJT7F>O&zj`KHI7>cUUc`}dyMOy
zXAjdn@Xf13*3ZAMbY!3O7i)(W-q8K69~$R;|LpUF-gxcVPxf5=^b471PK{ZcU4QGY
z$|ufinbT)Rz3rX#WeYCNc{lC;%ibB4eA~eJhki<S5BTh-TwAxb+cLir<2Bdq_E>x8
ztlBW=0by*y+DC@|xbt68z7LmAoA`k@M}a-zTk~m&v#ywwl~7xp?=H2M+3OdlX#Y=Z
zCbj*VNl9hR{HfPW&I1_}h0Ljr=E{UA_O!(*n*Y<9Nol`kl36o<?&nP0qeTTpQ?u)4
zPq5Y0$<G<}|7p!6w_7tAqmy~g{F$FK37>Ds^tf`9^JZj@&Z)0cekE$0Z&pbgBuV<q
z{G;<X&7U_vO-|rI009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1pb=^hG@&wb$)+?Z%k5BFc?g9h@!(KBs%>`wbt2Ao9IcD14E&%rFUB~
zx7aLt9f>x(CsDq1x?I*okKj*o3wEb9$?0|^)jGXGt=QPUh4HD$DQOAGS^7L(i~0ZD
zQbNk;%)|zdBWkoZ*w%>EZWlei<A&q&Tm4R3cs$2uVmw>dq77AToo{3Y@{E#Flan)&
z+*Z4g5NJqfoqkeULP~mST1rMrMrKN8YKHEA-9T#l22xVB|LX=)+BcA#su?d&!KB=?
z-#Uflb`4~VPBzQyT_ZiClHQR64g?TD009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1pdGRaT={Equgb+3BIH$ZmZXyBZ~F%xqhHpt17H%
zjg))E2Eprh%7yHL&*pVD_?@CBTAsH?+N_d3mIDq15I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009L4$N~ekg{B%&tan?z_2pi%LGb#W
zf-lJ~_-tNhgWoB7`e-xM<u0pDPMso`^5?Xc)|i!fFZd%*p0Oi<00IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q5t93z+35bW*fRx>~A}
zGUN*m1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmdXNa)EeV7nNGA8fa9j_4-&%g<umr{z|LEr_-vUVy71szt9*tr)Wb(Q$j_}twmi;
zIigtawtDLYd!)+xgW)Rc51y$BRXHP6B}P*s`utO!KBxa!*<0(vWpAyUsg6;pO{$h~
zVQseEZmDT)+Gp{L7Jr@7XQ>rkcEPJeeS#n-32uws>1%LVn*_T>^e8Eo$bfv7N>Oyx
zSiP;|DtyKm>PtSG<-4wvQdH6wX}NU1e8GVL0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb`Mc5lGPKhK-GLi_O(FqFC>?dh2~1BGpd6
z;C6cKLSu$S{+FcH4IBSU#T%?%!Q*eOkY-64t<epe@=Fzz_FYz=-!0mmwNAl)tglqH
zZdhT@4x{N1sdfaM_UeGgIV&Kv)=G(%=Nv1oS4lrghowW(7t(&|18I-6TiPydm7bF}
zN>9j{90(wQ00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2>c!eqO@wYF;)o;W+l{jQ9@mm5^8lysL|@QCbdSVRjFf?AX*7bN?=q1gA(Yq
zT9qkUo?oogMJ4?peJgz>?Upu64@fsiOQc!Sxl+EAD)pB$IS@bq0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**{+k4PXyes>XQJS8h@vAg
z7z`$wdum6h-J-31T1+o(g4*E~6Rj?nvsrY93U)bBV)Tg;O(#l>I#HtTM2XrHC2D$V
z6HJ|l6sJw=Fif9EwA-zTu{y0vZBzn-66mAlI~*%Lp^|=-4oiomFQom_2htvCxAeNS
zO?pw<ENzf8IS@bq0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5cvHH=(HwvtP+@&AVvwgC_%Imm~>jB+NcBuCD1EDloIHaK&u2At=4FY
zmgg5M-J_Dem;NOkls=O_l-`wgOWUQb(sR-V=`racIg<kc1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmdW?kAPmQQLC0kg-^QhNgF<C
zqO=;5oTpW*?XjWI913GXVRR@o>9j_*Q3(u6pjQ%q?h-A}FIKulCH*KJmJUf@Nc*J^
zq&?DZX^Zp^=^^QMX{DUWfdB#sAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_0!2dsi7_DBdii(|HDy-iS8;O+c+kDX67I}MFV@xDc+<n2W
zE^U$MMbAe^B1K2@hMRO+mD;ET1|`rdL6j2clt8Nl8m(4kik9c6m+nwWholdr*QL$U
zBXWcT0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_Kd-={#VPOVqRs-j}2mkR4Q=tEJn5-r)c`CwEi8WW1Xy{u6eigr<=#oZU|(uShZ
zp=k7?=QU=zDU(Tw79GtS9xcyTFYQ%HKT3zCL(&)0$8v-N0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_KdKbt_5R;|`WDWOKI)0)&8
zoz|$<D}hd{HJYO3`Rb*0D(M^PW9dz4tF%Fma3FvH0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAn^Mah|%iRs;JoMrNa6R`beZ?-{yl+
zZIQQ^HR>Xf;_eG}Y1<;vi=NkX(dtb~14T#khDXcu?J8ZTlD?O|mOht0l=etFrB|dE
zrA^Y4(t7DW=?-bNoXvp%0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb`MsMnJDqo7BeG(8*v9o%AuGQ&gAGNf#YDX-%P%#u%kDnbdl{
zPNi0ByM|60L--UGKIy_IZTO^#l1rL2(emuNO4q8SAEbXt2c-SdUg=F~yY!N@NqSOR
zFWo2IA+3_LIS@bq0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5cp3B7<6j2+Mw+cK5L@&I<-k{Fv%yQ+F%UDwE9p?8xty{(Hg>MP1jJa
zCN`9-G3#|EwOSh$I%#xKI+IC`=}bnoMyE3xP0{k~x=O=U($~_5(oX3G=?Q7Av`Sho
zEtGtcU8<5MN~7d#4g?TD009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1VRF_I<;PHR7J&3FDl-8erzae2uIf+G>4-4aCA+1Oeh)^icZ?m
z*d-Lzg`;a$Mu(!>aCFXUQz)tlM=P%|nsp|<Iut8Bv|n%5saj*jJCeJ0h-uozRy?3R
z7Mry3py61oaC}x&TWr#irQhjd<Tg!84@xXro?YzRhg8x(q$a7y{7>dTG5@0ZmGcMB
z+duE2dH%WI&D||$av*>J0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfWYrmV5oMoy1`|&31j?C4Z^t0p+3>;AD5Co)NO675PSib-#0EL+1Ov3
z-C8V^pVcv2KS$Tn)S6!_y6l2?Tuxb8QAu`1(Uj_vywa+nt*KR|6AO#;a;w{NBN>%t
zWyLw!6+>qQ1aDKNGLn?mk)(F)YN*g?a|P_eWVxVIkjG{ir<K%oet&~+Oj1%X7)*4F
z%}$rgnkaf5Ney0creO2?l4_k^p;l~6O3O-2wx%dipWhqsB$+a_;z?^qDtVlaI=`#w
zSgq)>+Bqk!C3q65rnGf<T-`27TH9}|TPL_0k~HaB_irq33;6t^+u1B6X;ZXL)5%ae
z4$vle{9daoDM4HPE8W;cxumlu;1`l~!?jhvQrcQ02K-4;wYrwF4kaC;=x_;%PJfb5
zuzGEE<7bWY&2l;Y!U(t3V|57Lp-y33z+an?HB^jTID)=vuYH`&J5+Fv%gQLIoLW33
zJ*TwBYHdghI!YZm<~&`C`9$5=ME7s+C+2Kji?*#5tKBYod>xjPJm|=p2<0Y)N1o6+
z@}$^kd6&mZJyp^HX^*s3dQ!Sax?Z|SYLpz(R4Gr&kOs?{90(wQ00IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@|BV9Ov_sU5)9NxE*#)kg
zx)M)}k`NRojh-+)Pe`3wov!Pu9b%fDS?clzTr)<Om!>KOJSDRWt0#CTS5KJeH7W_U
z6Z5k3CkDmz-16dBC80)~lxAzptDHS4V^WloFry+Zy?L6LKOuLvpivU4it5YiCsYfy
zWi<t6C85BX=cvm`&lP9dt4&J6Xn*r4Uur^`Ki8QStt4br2sJ59&f2`0B~uKcgwjc)
zrj$>}c2BYSv`RvXTg-1L7ix<#(`{XpgoJ`%eMNKLIT_{kll9T^9quY=RMG)ykF-^K
zQo2XFUb;wXlpNAI(nKjk8Z7mcvpEnz009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{
z1Q0*~0R#|0009ILKmY**5I_I{1pf2_-Lym0!3j;H8p~&muE{LQ(klr8Z$;2QdO~xl
zvpyITO7PS=U4p$@Iii#VzbLwDtlm(9Hk4p>_(Cx`&~?=gF?mJNA4yOOxCKuj64xjR
z&Ze17=QK^rv)Y8rE=t1mfLM`x&h%t!pfNdCNtisf!X9+aC=y2(+6_uVc~e$d%Cy2v
zU%5TlHI$H6Z*2^wRAl7`^P`o7vU;bhGEmV}l;z4WDhUORWiwp9s@a~>vQ(3jkm+hJ
ztjlZ+R6D90%+bpIUGS&B$xILd1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL
zKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmdVX6o^)G7yM!oG7&%k0R#|0009ILKmY**5I_I{1Q0*~
z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**
z5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5ctyzM9VYON$;zq@1;Z1r}6~{0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@e@X#^
ZPOVnQYILEqS)&b|V>Fs5o!Vs5{y&EWK&$`&

literal 0
HcmV?d00001

diff --git a/toolkit/components/places/tests/migration/test_current_from_v26.js b/toolkit/components/places/tests/migration/test_current_from_v26.js
new file mode 100644
index 000000000000..16705f85fea8
--- /dev/null
+++ b/toolkit/components/places/tests/migration/test_current_from_v26.js
@@ -0,0 +1,75 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+add_task(function* setup() {
+  yield setupPlacesDatabase("places_v26.sqlite");
+  // Setup database contents to be migrated.
+  let path = OS.Path.join(OS.Constants.Path.profileDir, DB_FILENAME);
+  let db = yield Sqlite.openConnection({ path });
+  // Add pages.
+  yield db.execute(`INSERT INTO moz_places (url, guid)
+                    VALUES ("http://test1.com/", "test1_______")
+                         , ("http://test2.com/", "test2_______")
+                   `);
+  // Add keywords.
+  yield db.execute(`INSERT INTO moz_keywords (keyword)
+                    VALUES ("kw1")
+                         , ("kw2")
+                         , ("kw3")
+                   `);
+  // Add bookmarks.
+  let now = Date.now() * 1000;
+  let index = 0;
+  yield db.execute(`INSERT INTO moz_bookmarks (type, fk, parent, position, dateAdded, lastModified, keyword_id, guid)
+                    VALUES (1, (SELECT id FROM moz_places WHERE guid = 'test1_______'), 3, ${index++}, ${now}, ${now},
+                             (SELECT id FROM moz_keywords WHERE keyword = 'kw1'), "bookmark1___")
+                            /* same uri, different keyword */
+                         , (1, (SELECT id FROM moz_places WHERE guid = 'test1_______'), 3, ${index++}, ${now}, ${now},
+                             (SELECT id FROM moz_keywords WHERE keyword = 'kw2'), "bookmark2___")
+                           /* different uri, same keyword as 1 */
+                         , (1, (SELECT id FROM moz_places WHERE guid = 'test2_______'), 3, ${index++}, ${now}, ${now},
+                             (SELECT id FROM moz_keywords WHERE keyword = 'kw1'), "bookmark3___")
+                           /* same uri, same keyword as 1 */
+                         , (1, (SELECT id FROM moz_places WHERE guid = 'test1_______'), 3, ${index++}, ${now}, ${now},
+                             (SELECT id FROM moz_keywords WHERE keyword = 'kw1'), "bookmark4___")
+                           /* same uri, same keyword as 2 */
+                         , (1, (SELECT id FROM moz_places WHERE guid = 'test2_______'), 3, ${index++}, ${now}, ${now},
+                             (SELECT id FROM moz_keywords WHERE keyword = 'kw2'), "bookmark5___")
+                           /* different uri, same keyword as 1 */
+                         , (1, (SELECT id FROM moz_places WHERE guid = 'test1_______'), 3, ${index++}, ${now}, ${now},
+                             (SELECT id FROM moz_keywords WHERE keyword = 'kw3'), "bookmark6___")
+                   `);
+  // Add postData.
+  yield db.execute(`INSERT INTO moz_anno_attributes (name)
+                    VALUES ("bookmarkProperties/POSTData")`);
+  yield db.execute(`INSERT INTO moz_items_annos(anno_attribute_id, item_id, content)
+                    VALUES ((SELECT id FROM moz_anno_attributes where name = "bookmarkProperties/POSTData"),
+                            (SELECT id FROM moz_bookmarks WHERE guid = "bookmark3___"), "postData1")
+                         , ((SELECT id FROM moz_anno_attributes where name = "bookmarkProperties/POSTData"),
+                            (SELECT id FROM moz_bookmarks WHERE guid = "bookmark5___"), "postData2")`);
+  yield db.close();
+});
+
+add_task(function* database_is_valid() {
+  Assert.equal(PlacesUtils.history.databaseStatus,
+               PlacesUtils.history.DATABASE_STATUS_UPGRADED);
+
+  let db = yield PlacesUtils.promiseDBConnection();
+  Assert.equal((yield db.getSchemaVersion()), CURRENT_SCHEMA_VERSION);
+});
+
+add_task(function* test_keywords() {
+  // When 2 urls have the same keyword, if one has postData it will be
+  // preferred.
+  let [ url1, postData1 ] = PlacesUtils.getURLAndPostDataForKeyword("kw1");
+  Assert.equal(url1, "http://test2.com/");
+  Assert.equal(postData1, "postData1");
+  let [ url2, postData2 ] = PlacesUtils.getURLAndPostDataForKeyword("kw2");
+  Assert.equal(url2, "http://test2.com/");
+  Assert.equal(postData2, "postData2");
+  let [ url3, postData3 ] = PlacesUtils.getURLAndPostDataForKeyword("kw3");
+  Assert.equal(url3, "http://test1.com/");
+
+  Assert.equal((yield foreign_count("http://test1.com/")), 5); // 4 bookmark2 + 1 keywords
+  Assert.equal((yield foreign_count("http://test2.com/")), 4); // 2 bookmark2 + 2 keywords
+});
diff --git a/toolkit/components/places/tests/migration/xpcshell.ini b/toolkit/components/places/tests/migration/xpcshell.ini
index cc3c24773776..a22d17d60bf6 100644
--- a/toolkit/components/places/tests/migration/xpcshell.ini
+++ b/toolkit/components/places/tests/migration/xpcshell.ini
@@ -15,6 +15,7 @@ support-files =
   places_v24.sqlite
   places_v25.sqlite
   places_v26.sqlite
+  places_v27.sqlite
 
 [test_current_from_downgraded.js]
 [test_current_from_v6.js]
@@ -22,3 +23,4 @@ support-files =
 [test_current_from_v19.js]
 [test_current_from_v24.js]
 [test_current_from_v25.js]
+[test_current_from_v26.js]
diff --git a/toolkit/components/places/tests/queries/test_sorting.js b/toolkit/components/places/tests/queries/test_sorting.js
index e6c28ce3b263..a5ca67586cea 100644
--- a/toolkit/components/places/tests/queries/test_sorting.js
+++ b/toolkit/components/places/tests/queries/test_sorting.js
@@ -504,7 +504,7 @@ tests.push({
 
       // if keywords are equal, should fall back to title
       { isBookmark: true,
-        uri: "http://example.com/b2",
+        uri: "http://example.com/b1",
         parentFolder: PlacesUtils.bookmarks.toolbarFolder,
         index: PlacesUtils.bookmarks.DEFAULT_INDEX,
         title: "y8",
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
index 0d133a4e8b53..62fb1a97f75c 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
@@ -19,30 +19,30 @@ add_task(function* test_keyword_searc() {
     { uri: uri1, title: "Generic page title" },
     { uri: uri2, title: "Generic page title" }
   ]);
-  yield addBookmark({ uri: uri1, title: "Keyword title", keyword: "key"});
+  yield addBookmark({ uri: uri1, title: "Bookmark title", keyword: "key"});
 
   do_print("Plain keyword query");
   yield check_autocomplete({
     search: "key term",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search=term"), title: "Keyword title", style: ["keyword"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search=term"), title: "Generic page title", style: ["keyword"] } ]
   });
 
   do_print("Multi-word keyword query");
   yield check_autocomplete({
     search: "key multi word",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search=multi+word"), title: "Keyword title", style: ["keyword"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search=multi+word"), title: "Generic page title", style: ["keyword"] } ]
   });
 
   do_print("Keyword query with +");
   yield check_autocomplete({
     search: "key blocking+",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search=blocking%2B"), title: "Keyword title", style: ["keyword"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search=blocking%2B"), title: "Generic page title", style: ["keyword"] } ]
   });
 
   do_print("Unescaped term in query");
   yield check_autocomplete({
     search: "key ユニコード",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search=ユニコード"), title: "Keyword title", style: ["keyword"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search=ユニコード"), title: "Generic page title", style: ["keyword"] } ]
   });
 
   do_print("Keyword that happens to match a page");
@@ -54,25 +54,13 @@ add_task(function* test_keyword_searc() {
   do_print("Keyword without query (without space)");
   yield check_autocomplete({
     search: "key",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search="), title: "Keyword title", style: ["keyword"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search="), title: "Generic page title", style: ["keyword"] } ]
   });
 
   do_print("Keyword without query (with space)");
   yield check_autocomplete({
     search: "key ",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search="), title: "Keyword title", style: ["keyword"] } ]
-  });
-
-  // This adds a second keyword so anything after this will match 2 keywords
-  let uri3 = NetUtil.newURI("http://xyz/?foo=%s");
-  yield PlacesTestUtils.addVisits([ { uri: uri3, title: "Generic page title" } ]);
-  yield addBookmark({ uri: uri3, title: "Keyword title", keyword: "key", style: ["keyword"] });
-
-  do_print("Two keywords matched");
-  yield check_autocomplete({
-    search: "key twoKey",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search=twoKey"), title: "Keyword title", style: ["keyword"] },
-               { uri: NetUtil.newURI("http://xyz/?foo=twoKey"), title: "Keyword title", style: ["keyword"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search="), title: "Generic page title", style: ["keyword"] } ]
   });
 
   yield cleanup();
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search_actions.js b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search_actions.js
index 3c6c5d804f8a..410411ddeda9 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search_actions.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search_actions.js
@@ -19,68 +19,55 @@ add_task(function* test_keyword_search() {
     { uri: uri1, title: "Generic page title" },
     { uri: uri2, title: "Generic page title" }
   ]);
-  yield addBookmark({ uri: uri1, title: "Keyword title", keyword: "key"});
+  yield addBookmark({ uri: uri1, title: "Bookmark title", keyword: "key"});
 
   do_print("Plain keyword query");
   yield check_autocomplete({
     search: "key term",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=term", input: "key term"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=term", input: "key term"}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   do_print("Multi-word keyword query");
   yield check_autocomplete({
     search: "key multi word",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=multi+word", input: "key multi word"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=multi+word", input: "key multi word"}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   do_print("Keyword query with +");
   yield check_autocomplete({
     search: "key blocking+",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=blocking%2B", input: "key blocking+"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=blocking%2B", input: "key blocking+"}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   do_print("Unescaped term in query");
   yield check_autocomplete({
     search: "key ユニコード",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=ユニコード", input: "key ユニコード"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=ユニコード", input: "key ユニコード"}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   do_print("Keyword that happens to match a page");
   yield check_autocomplete({
     search: "key ThisPageIsInHistory",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=ThisPageIsInHistory", input: "key ThisPageIsInHistory"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=ThisPageIsInHistory", input: "key ThisPageIsInHistory"}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   do_print("Keyword without query (without space)");
   yield check_autocomplete({
     search: "key",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=", input: "key"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=", input: "key"}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   do_print("Keyword without query (with space)");
   yield check_autocomplete({
     search: "key ",
     searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=", input: "key "}), title: "Keyword title", style: [ "action", "keyword" ] } ]
-  });
-
-  // This adds a second keyword so anything after this will match 2 keywords
-  let uri3 = NetUtil.newURI("http://xyz/?foo=%s");
-  yield PlacesTestUtils.addVisits([ { uri: uri3, title: "Generic page title" } ]);
-  yield addBookmark({ uri: uri3, title: "Keyword title", keyword: "key"});
-
-  do_print("Two keywords matched");
-  yield check_autocomplete({
-    search: "key twoKey",
-    searchParam: "enable-actions",
-    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=twoKey", input: "key twoKey"}), title: "Keyword title", style: [ "action", "keyword" ] },
-               { uri: makeActionURI("keyword", {url: "http://xyz/?foo=twoKey", input: "key twoKey"}), title: "Keyword title", style: [ "action", "keyword" ] } ]
+    matches: [ { uri: makeActionURI("keyword", {url: "http://abc/?search=", input: "key "}), title: "Generic page title", style: [ "action", "keyword" ] } ]
   });
 
   yield cleanup();
diff --git a/toolkit/components/places/tests/unit/test_398914.js b/toolkit/components/places/tests/unit/test_398914.js
index 1e4ac8ac0eb4..5c4ee37afcdb 100644
--- a/toolkit/components/places/tests/unit/test_398914.js
+++ b/toolkit/components/places/tests/unit/test_398914.js
@@ -1,13 +1,3 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const bmsvc = PlacesUtils.bookmarks;
-const testFolderId = PlacesUtils.bookmarksMenuFolderId;
-
-// main
 function run_test() {
   var testURI = uri("http://foo.com");
 
@@ -16,11 +6,11 @@ function run_test() {
   2. Create a bookmark for the same URI, with a different keyword and different post data.
   3. Confirm that our method for getting a URI+postdata retains bookmark affinity.
   */
-  var bm1 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm1, "foo");
+  var bm1 = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.bookmarksMenuFolderId, testURI, -1, "blah");
+  PlacesUtils.bookmarks.setKeywordForBookmark(bm1, "foo");
   PlacesUtils.setPostDataForBookmark(bm1, "pdata1");
-  var bm2 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm2, "bar");
+  var bm2 = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.bookmarksMenuFolderId, testURI, -1, "blah");
+  PlacesUtils.bookmarks.setKeywordForBookmark(bm2, "bar");
   PlacesUtils.setPostDataForBookmark(bm2, "pdata2");
 
   // check kw, pd for bookmark 1
@@ -35,116 +25,6 @@ function run_test() {
   do_check_eq(postdata, "pdata2");
 
   // cleanup
-  bmsvc.removeItem(bm1);
-  bmsvc.removeItem(bm2);
-
-  /*
-  1. Create two bookmarks with the same URI and keyword.
-  2. Confirm that the most recently created one is returned for that keyword.
-  */
-  var bm1 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm1, "foo");
-  PlacesUtils.setPostDataForBookmark(bm1, "pdata1");
-  var bm2 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm2, "foo");
-  PlacesUtils.setPostDataForBookmark(bm2, "pdata2");
-
-  var bm1da = bmsvc.getItemDateAdded(bm1);
-  var bm1lm = bmsvc.getItemLastModified(bm1);
-  LOG("bm1 dateAdded: " + bm1da + ", lastModified: " + bm1lm);
-  var bm2da = bmsvc.getItemDateAdded(bm2);
-  var bm2lm = bmsvc.getItemLastModified(bm2);
-  LOG("bm2 dateAdded: " + bm2da + ", lastModified: " + bm2lm);
-  do_check_true(bm1da <= bm2da);
-  do_check_true(bm1lm <= bm2lm);
-
-  [url, postdata] = PlacesUtils.getURLAndPostDataForKeyword("foo");
-  do_check_eq(testURI.spec, url);
-  do_check_eq(postdata, "pdata2");
-
-  // cleanup
-  bmsvc.removeItem(bm1);
-  bmsvc.removeItem(bm2);
-
-  /*
-  1. Create two bookmarks with the same URI and keyword.
-  2. Modify the first-created bookmark.
-  3. Confirm that the most recently modified one is returned for that keyword.
-  */
-  var bm1 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm1, "foo");
-  PlacesUtils.setPostDataForBookmark(bm1, "pdata1");
-  var bm2 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm2, "foo");
-  PlacesUtils.setPostDataForBookmark(bm2, "pdata2");
-
-  // modify the older bookmark
-  bmsvc.setItemTitle(bm1, "change");
-
-  var bm1da = bmsvc.getItemDateAdded(bm1);
-  var bm1lm = bmsvc.getItemLastModified(bm1);
-  LOG("bm1 dateAdded: " + bm1da + ", lastModified: " + bm1lm);
-  var bm2da = bmsvc.getItemDateAdded(bm2);
-  var bm2lm = bmsvc.getItemLastModified(bm2);
-  LOG("bm2 dateAdded: " + bm2da + ", lastModified: " + bm2lm);
-  do_check_true(bm1da <= bm2da);
-  // the last modified for bm1 should be at least as big as bm2
-  // but could be equal if the test runs faster than our PRNow()
-  // granularity
-  do_check_true(bm1lm >= bm2lm);
-
-  // we need to ensure that bm1 last modified date is greater
-  // that the modified date of bm2, otherwise in case of a "tie"
-  // bm2 will win, as it has a bigger item id
-  if (bm1lm == bm2lm) 
-    bmsvc.setItemLastModified(bm1, bm2lm + 1000);
-
-  [url, postdata] = PlacesUtils.getURLAndPostDataForKeyword("foo");
-  do_check_eq(testURI.spec, url);
-  do_check_eq(postdata, "pdata1");
-
-  // cleanup
-  bmsvc.removeItem(bm1);
-  bmsvc.removeItem(bm2);
-
-  /*
-  Test that id breaks ties:
-  1. Create two bookmarks with the same URI and keyword, dateAdded and lastModified.
-  2. Confirm that the most recently created one is returned for that keyword.
-  */
-  var testDate = Date.now() * 1000;
-  var bm1 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm1, "foo");
-  PlacesUtils.setPostDataForBookmark(bm1, "pdata1");
-  bmsvc.setItemDateAdded(bm1, testDate);
-  bmsvc.setItemLastModified(bm1, testDate);
-
-  var bm2 = bmsvc.insertBookmark(testFolderId, testURI, -1, "blah");
-  bmsvc.setKeywordForBookmark(bm2, "foo");
-  PlacesUtils.setPostDataForBookmark(bm2, "pdata2");
-  bmsvc.setItemDateAdded(bm2, testDate);
-  bmsvc.setItemLastModified(bm2, testDate);
-
-  var bm1da = bmsvc.getItemDateAdded(bm1, testDate);
-  var bm1lm = bmsvc.getItemLastModified(bm1);
-  LOG("bm1 dateAdded: " + bm1da + ", lastModified: " + bm1lm);
-  var bm2da = bmsvc.getItemDateAdded(bm2);
-  var bm2lm = bmsvc.getItemLastModified(bm2);
-  LOG("bm2 dateAdded: " + bm2da + ", lastModified: " + bm2lm);
-
-  do_check_eq(bm1da, bm2da);
-  do_check_eq(bm1lm, bm2lm);
-
-
-  var ids = bmsvc.getBookmarkIdsForURI(testURI);
-  do_check_eq(ids[0], bm2);
-  do_check_eq(ids[1], bm1);
-
-  [url, postdata] = PlacesUtils.getURLAndPostDataForKeyword("foo");
-  do_check_eq(testURI.spec, url);
-  do_check_eq(postdata, "pdata2");
-
-  // cleanup
-  bmsvc.removeItem(bm1);
-  bmsvc.removeItem(bm2);
+  PlacesUtils.bookmarks.removeItem(bm1);
+  PlacesUtils.bookmarks.removeItem(bm2);
 }
diff --git a/toolkit/components/places/tests/unit/test_async_transactions.js b/toolkit/components/places/tests/unit/test_async_transactions.js
index 61bddb9a5c4f..de59152de63e 100644
--- a/toolkit/components/places/tests/unit/test_async_transactions.js
+++ b/toolkit/components/places/tests/unit/test_async_transactions.js
@@ -739,11 +739,7 @@ add_task(function* test_add_and_remove_bookmarks_with_additional_info() {
    , newValue: ANNO.value },
    { guid: b2_info.guid
    , property: "keyword"
-   , newValue: KEYWORD },
-   { guid: b2_info.guid
-   , isAnnoProperty: true
-   , property: PlacesUtils.POST_DATA_ANNO
-   , newValue: POST_DATA } ];
+   , newValue: KEYWORD } ];
   ensureItemsChanged(...b2_post_creation_changes);
   ensureTags([TAG_1, TAG_2]);
 
diff --git a/toolkit/components/places/tests/unit/test_placesTxn.js b/toolkit/components/places/tests/unit/test_placesTxn.js
index a715f0199885..f8bb1aa83b7c 100644
--- a/toolkit/components/places/tests/unit/test_placesTxn.js
+++ b/toolkit/components/places/tests/unit/test_placesTxn.js
@@ -721,15 +721,19 @@ add_test(function test_edit_postData() {
   let postData = "post-test_edit_postData";
   let testURI = NetUtil.newURI("http://test_edit_postData.com");
   let testBkmId = bmsvc.insertBookmark(root, testURI, bmsvc.DEFAULT_INDEX, "Test edit Post Data");
-
+  PlacesUtils.bookmarks.setKeywordForBookmark(testBkmId, "kw");
   let txn = new PlacesEditBookmarkPostDataTransaction(testBkmId, postData);
 
   txn.doTransaction();
-  do_check_true(annosvc.itemHasAnnotation(testBkmId, POST_DATA_ANNO));
-  do_check_eq(annosvc.getItemAnnotation(testBkmId, POST_DATA_ANNO), postData);
+  let [url, post_data] = PlacesUtils.getURLAndPostDataForKeyword("kw");
+  Assert.equal(url, testURI.spec);
+  Assert.equal(postData, post_data);
 
   txn.undoTransaction();
-  do_check_false(annosvc.itemHasAnnotation(testBkmId, POST_DATA_ANNO));
+  [url, post_data] = PlacesUtils.getURLAndPostDataForKeyword("kw");
+  Assert.equal(url, testURI.spec);
+  Assert.equal(null, post_data);
+
 
   run_next_test();
 });
diff --git a/toolkit/components/places/tests/unit/test_preventive_maintenance.js b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
index 8d85e188b203..490e6cff1abd 100644
--- a/toolkit/components/places/tests/unit/test_preventive_maintenance.js
+++ b/toolkit/components/places/tests/unit/test_preventive_maintenance.js
@@ -544,53 +544,6 @@ tests.push({
 
 //------------------------------------------------------------------------------
 
-tests.push({
-  name: "D.5",
-  desc: "Fix wrong keywords",
-
-  _validKeywordItemId: null,
-  _invalidKeywordItemId: null,
-  _validKeywordId: 1,
-  _invalidKeywordId: 8888,
-  _placeId: null,
-
-  setup: function() {
-    // Insert a keyword
-    let stmt = mDBConn.createStatement("INSERT INTO moz_keywords (id, keyword) VALUES(:id, :keyword)");
-    stmt.params["id"] = this._validKeywordId;
-    stmt.params["keyword"] = "used";
-    stmt.execute();
-    stmt.finalize();
-    // Add a place to ensure place_id = 1 is valid
-    this._placeId = addPlace();
-    // Add a bookmark using the keyword
-    this._validKeywordItemId = addBookmark(this._placeId, bs.TYPE_BOOKMARK, bs.unfiledBookmarksFolder, this._validKeywordId);
-    // Add a bookmark using a nonexistent keyword
-    this._invalidKeywordItemId = addBookmark(this._placeId, bs.TYPE_BOOKMARK, bs.unfiledBookmarksFolder, this._invalidKeywordId);
-  },
-
-  check: function() {
-    // Check that item with valid keyword is there
-    let stmt = mDBConn.createStatement("SELECT id FROM moz_bookmarks WHERE id = :item_id AND keyword_id = :keyword");
-    stmt.params["item_id"] = this._validKeywordItemId;
-    stmt.params["keyword"] = this._validKeywordId;
-    do_check_true(stmt.executeStep());
-    stmt.reset();
-    // Check that item with invalid keyword has been corrected
-    stmt.params["item_id"] = this._invalidKeywordItemId;
-    stmt.params["keyword"] = this._invalidKeywordId;
-    do_check_false(stmt.executeStep());
-    stmt.finalize();
-    // Check that item with invalid keyword has not been removed
-    stmt = mDBConn.createStatement("SELECT id FROM moz_bookmarks WHERE id = :item_id");
-    stmt.params["item_id"] = this._invalidKeywordItemId;
-    do_check_true(stmt.executeStep());
-    stmt.finalize();
-  }
-});
-
-//------------------------------------------------------------------------------
-
 tests.push({
   name: "D.6",
   desc: "Fix wrong item types | bookmarks",
@@ -1053,27 +1006,17 @@ tests.push({
 
   setup: function() {
     // Insert 2 keywords
-    let stmt = mDBConn.createStatement("INSERT INTO moz_keywords (id, keyword) VALUES(:id, :keyword)");
+    let stmt = mDBConn.createStatement("INSERT INTO moz_keywords (id, keyword, place_id) VALUES(:id, :keyword, :place_id)");
     stmt.params["id"] = 1;
-    stmt.params["keyword"] = "used";
-    stmt.execute();
-    stmt.reset();
-    stmt.params["id"] = 2;
     stmt.params["keyword"] = "unused";
+    stmt.params["place_id"] = 100;
     stmt.execute();
     stmt.finalize();
-    // Add a place to ensure place_id = 1 is valid
-    this._placeId = addPlace();
-    // Insert a bookmark using the "used" keyword
-    this._bookmarkId = addBookmark(this._placeId, bs.TYPE_BOOKMARK, bs.unfiledBookmarksFolder, 1);
   },
 
   check: function() {
     // Check that "used" keyword is still there
     let stmt = mDBConn.createStatement("SELECT id FROM moz_keywords WHERE keyword = :keyword");
-    stmt.params["keyword"] = "used";
-    do_check_true(stmt.executeStep());
-    stmt.reset();
     // Check that "unused" keyword has gone
     stmt.params["keyword"] = "unused";
     do_check_false(stmt.executeStep());
diff --git a/toolkit/components/places/tests/unit/test_telemetry.js b/toolkit/components/places/tests/unit/test_telemetry.js
index a0f18b7a8719..0cb3230b4e46 100644
--- a/toolkit/components/places/tests/unit/test_telemetry.js
+++ b/toolkit/components/places/tests/unit/test_telemetry.js
@@ -32,7 +32,7 @@ function run_test()
 add_task(function test_execute()
 {
   // Put some trash in the database.
-  const URI = NetUtil.newURI("http://moz.org/");
+  let uri = NetUtil.newURI("http://moz.org/");
 
   let folderId = PlacesUtils.bookmarks.createFolder(PlacesUtils.unfiledBookmarksFolderId,
                                                     "moz test",
@@ -64,7 +64,7 @@ add_task(function test_execute()
   // Test expiration probes.
   for (let i = 0; i < 2; i++) {
     yield PlacesTestUtils.addVisits({
-      uri: uri("http://" +  i + ".moz.org/"),
+      uri: NetUtil.newURI("http://" +  i + ".moz.org/"),
       visitDate: Date.now() // [sic]
     });
   }

From 05596be753d0536231fce2c9a2dbcc30674a8347 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 20 Mar 2015 09:39:25 +0100
Subject: [PATCH 17/80] Bug 1125115 - Write a new keywords pseudo-API in
 PlacesUtils. r=ttaubert

---
 .../test/general/browser_getshortcutoruri.js  |  67 ++-
 .../general/browser_keywordBookmarklets.js    |  50 +-
 browser/components/nsBrowserGlue.js           |  32 +-
 .../places/tests/unit/head_bookmarks.js       |  16 -
 .../tests/unit/test_browserGlue_corrupt.js    |   2 +-
 .../unit/test_browserGlue_corrupt_nobackup.js |   2 +-
 ...st_browserGlue_corrupt_nobackup_default.js |   2 +-
 .../tests/unit/test_browserGlue_migrate.js    |   2 +-
 .../tests/unit/test_browserGlue_prefs.js      |   4 +-
 .../tests/unit/test_browserGlue_restore.js    |   2 +-
 .../unit/test_browserGlue_smartBookmarks.js   |   2 -
 toolkit/components/places/Bookmarks.jsm       |  38 +-
 .../places/PlacesCategoriesStarter.js         |  17 +-
 toolkit/components/places/PlacesUtils.jsm     | 379 +++++++++++++-
 toolkit/components/places/nsNavBookmarks.cpp  |  82 +--
 .../places/tests/bookmarks/test_bookmarks.js  |  42 +-
 .../places/tests/bookmarks/test_keywords.js   |   9 +-
 .../unifiedcomplete/test_keyword_search.js    |   2 +-
 .../places/tests/unit/test_421180.js          |  94 ----
 .../places/tests/unit/test_keywords.js        | 488 ++++++++++++++++++
 .../places/tests/unit/test_placesTxn.js       |   4 +-
 .../components/places/tests/unit/xpcshell.ini |   2 +-
 22 files changed, 963 insertions(+), 375 deletions(-)
 delete mode 100644 toolkit/components/places/tests/unit/test_421180.js
 create mode 100644 toolkit/components/places/tests/unit/test_keywords.js

diff --git a/browser/base/content/test/general/browser_getshortcutoruri.js b/browser/base/content/test/general/browser_getshortcutoruri.js
index dd47b84d4a14..83959e815fae 100644
--- a/browser/base/content/test/general/browser_getshortcutoruri.js
+++ b/browser/base/content/test/general/browser_getshortcutoruri.js
@@ -91,57 +91,54 @@ var testData = [
    new keywordResult(null, null, true)]
 ];
 
-function test() {
-  waitForExplicitFinish();
+add_task(function* test_getshortcutoruri() {
+  yield setupKeywords();
 
-  setupKeywords();
+  for (let item of testData) {
+    let [data, result] = item;
 
-  Task.spawn(function() {
-    for each (var item in testData) {
-      let [data, result] = item;
+    let query = data.keyword;
+    if (data.searchWord)
+      query += " " + data.searchWord;
+    let returnedData = yield new Promise(
+      resolve => getShortcutOrURIAndPostData(query, resolve));
+    // null result.url means we should expect the same query we sent in
+    let expected = result.url || query;
+    is(returnedData.url, expected, "got correct URL for " + data.keyword);
+    is(getPostDataString(returnedData.postData), result.postData, "got correct postData for " + data.keyword);
+    is(returnedData.mayInheritPrincipal, !result.isUnsafe, "got correct mayInheritPrincipal for " + data.keyword);
+  }
 
-      let query = data.keyword;
-      if (data.searchWord)
-        query += " " + data.searchWord;
-      let returnedData = yield new Promise(
-        resolve => getShortcutOrURIAndPostData(query, resolve));
-      // null result.url means we should expect the same query we sent in
-      let expected = result.url || query;
-      is(returnedData.url, expected, "got correct URL for " + data.keyword);
-      is(getPostDataString(returnedData.postData), result.postData, "got correct postData for " + data.keyword);
-      is(returnedData.mayInheritPrincipal, !result.isUnsafe, "got correct mayInheritPrincipal for " + data.keyword);
-    }
-    cleanupKeywords();
-  }).then(finish);
-}
+  yield cleanupKeywords();
+});
 
-var gBMFolder = null;
-var gAddedEngines = [];
-function setupKeywords() {
-  gBMFolder = Application.bookmarks.menu.addFolder("keyword-test");
-  for each (var item in testData) {
-    var data = item[0];
+let folder = null;
+let gAddedEngines = [];
+
+function* setupKeywords() {
+  folder = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                type: PlacesUtils.bookmarks.TYPE_FOLDER,
+                                                title: "keyword-test" });
+  for (let item of testData) {
+    let data = item[0];
     if (data instanceof bmKeywordData) {
-      var bm = gBMFolder.addBookmark(data.keyword, data.uri);
-      bm.keyword = data.keyword;
-      if (data.postData)
-        bm.annotations.set("bookmarkProperties/POSTData", data.postData, Ci.nsIAnnotationService.EXPIRE_SESSION);
+      yield PlacesUtils.bookmarks.insert({ url: data.uri, parentGuid: folder.guid });
+      yield PlacesUtils.keywords.insert({ keyword: data.keyword, url: data.uri.spec, postData: data.postData });
     }
 
     if (data instanceof searchKeywordData) {
       Services.search.addEngineWithDetails(data.keyword, "", data.keyword, "", data.method, data.uri.spec);
-      var addedEngine = Services.search.getEngineByName(data.keyword);
+      let addedEngine = Services.search.getEngineByName(data.keyword);
       if (data.postData) {
-        var [paramName, paramValue] = data.postData.split("=");
+        let [paramName, paramValue] = data.postData.split("=");
         addedEngine.addParam(paramName, paramValue, null);
       }
-
       gAddedEngines.push(addedEngine);
     }
   }
 }
 
-function cleanupKeywords() {
-  gBMFolder.remove();
+function* cleanupKeywords() {
+  PlacesUtils.bookmarks.remove(folder);
   gAddedEngines.map(Services.search.removeEngine);
 }
diff --git a/browser/base/content/test/general/browser_keywordBookmarklets.js b/browser/base/content/test/general/browser_keywordBookmarklets.js
index 8b075d74cc2b..434951251bdd 100644
--- a/browser/base/content/test/general/browser_keywordBookmarklets.js
+++ b/browser/base/content/test/general/browser_keywordBookmarklets.js
@@ -1,38 +1,34 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict"
 
-function test() {
-  waitForExplicitFinish();
-
-  let bmFolder = Application.bookmarks.menu.addFolder("keyword-test");
+add_task(function* test_keyword_bookmarklet() {
+  let bm = yield PlacesUtils.bookmarks.insert({ parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+                                                title: "bookmarklet",
+                                                url: "javascript:1;" });
   let tab = gBrowser.selectedTab = gBrowser.addTab();
-
-  registerCleanupFunction (function () {
-    bmFolder.remove();
+  registerCleanupFunction (function* () {
     gBrowser.removeTab(tab);
+    yield PlacesUtils.bookmarks.remove(bm);
   });
+  yield promisePageShow();
+  let originalPrincipal = gBrowser.contentPrincipal;
 
-  let bm = bmFolder.addBookmark("bookmarklet", makeURI("javascript:1;"));
-  bm.keyword = "bm";
+  yield PlacesUtils.keywords.insert({ keyword: "bm", url: "javascript:1;" })
 
-  addPageShowListener(function () {
-    let originalPrincipal = gBrowser.contentPrincipal;
+  // Enter bookmarklet keyword in the URL bar
+  gURLBar.value = "bm";
+  gURLBar.focus();
+  EventUtils.synthesizeKey("VK_RETURN", {});
 
-    // Enter bookmarklet keyword in the URL bar
-    gURLBar.value = "bm";
-    gURLBar.focus();
-    EventUtils.synthesizeKey("VK_RETURN", {});
+  yield promisePageShow();
 
-    addPageShowListener(function () {
-      ok(gBrowser.contentPrincipal.equals(originalPrincipal), "javascript bookmarklet should inherit principal");
-      finish();
+  ok(gBrowser.contentPrincipal.equals(originalPrincipal), "javascript bookmarklet should inherit principal");
+});
+
+function* promisePageShow() {
+  return new Promise(resolve => {
+    gBrowser.selectedBrowser.addEventListener("pageshow", function listen() {
+      gBrowser.selectedBrowser.removeEventListener("pageshow", listen);
+      resolve();
     });
   });
 }
-
-function addPageShowListener(func) {
-  gBrowser.selectedBrowser.addEventListener("pageshow", function loadListener() {
-    gBrowser.selectedBrowser.removeEventListener("pageshow", loadListener, false);
-    func();
-  });
-}
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index cb688ab001f1..e1d13296b819 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1429,7 +1429,7 @@ BrowserGlue.prototype = {
         () => BookmarkHTMLUtils.exportToFile(BookmarkHTMLUtils.defaultPath));
     }
 
-    Task.spawn(function() {
+    Task.spawn(function* () {
       // Check if Safe Mode or the user has required to restore bookmarks from
       // default profile's bookmarks.html
       let restoreDefaultBookmarks = false;
@@ -1505,23 +1505,21 @@ BrowserGlue.prototype = {
         if (bookmarksUrl) {
           // Import from bookmarks.html file.
           try {
-            BookmarkHTMLUtils.importFromURL(bookmarksUrl, true).then(null,
-              function onFailure() {
-                Cu.reportError("Bookmarks.html file could be corrupt.");
-              }
-            ).then(
-              function onComplete() {
-                // Now apply distribution customized bookmarks.
-                // This should always run after Places initialization.
-                this._distributionCustomizer.applyBookmarks();
-                // Ensure that smart bookmarks are created once the operation is
-                // complete.
-                this.ensurePlacesDefaultQueriesInitialized();
-              }.bind(this)
-            );
-          } catch (err) {
-            Cu.reportError("Bookmarks.html file could be corrupt. " + err);
+            yield BookmarkHTMLUtils.importFromURL(bookmarksUrl, true);
+          } catch (e) {
+            Cu.reportError("Bookmarks.html file could be corrupt. " + e);
           }
+          try {
+            // Now apply distribution customized bookmarks.
+            // This should always run after Places initialization.
+            this._distributionCustomizer.applyBookmarks();
+            // Ensure that smart bookmarks are created once the operation is
+            // complete.
+            this.ensurePlacesDefaultQueriesInitialized();
+          } catch (e) {
+            Cu.reportError(e);
+          }
+
         }
         else {
           Cu.reportError("Unable to find bookmarks.html file.");
diff --git a/browser/components/places/tests/unit/head_bookmarks.js b/browser/components/places/tests/unit/head_bookmarks.js
index a45f4d1428c1..f277d34d7eba 100644
--- a/browser/components/places/tests/unit/head_bookmarks.js
+++ b/browser/components/places/tests/unit/head_bookmarks.js
@@ -78,22 +78,6 @@ function checkItemHasAnnotation(guid, name) {
   });
 }
 
-function waitForImportAndSmartBookmarks() {
-  return Promise.all([
-    promiseTopicObserved("bookmarks-restore-success"),
-    PlacesTestUtils.promiseAsyncUpdates()
-  ]);
-}
-
-function promiseEndUpdateBatch() {
-  return new Promise(resolve => {
-    PlacesUtils.bookmarks.addObserver({
-      __proto__: NavBookmarkObserver.prototype,
-      onEndUpdateBatch: resolve
-    }, false);
-  });
-}
-
 let createCorruptDB = Task.async(function* () {
   let dbPath = OS.Path.join(OS.Constants.Path.profileDir, "places.sqlite");
   yield OS.File.remove(dbPath);
diff --git a/browser/components/places/tests/unit/test_browserGlue_corrupt.js b/browser/components/places/tests/unit/test_browserGlue_corrupt.js
index 56e55c55d813..4460453eb794 100644
--- a/browser/components/places/tests/unit/test_browserGlue_corrupt.js
+++ b/browser/components/places/tests/unit/test_browserGlue_corrupt.js
@@ -41,7 +41,7 @@ add_task(function* test_main() {
 
   // The test will continue once restore has finished and smart bookmarks
   // have been created.
-  yield promiseEndUpdateBatch();
+  yield promiseTopicObserved("places-browser-init-complete");
 
   let bm = yield PlacesUtils.bookmarks.fetch({
     parentGuid: PlacesUtils.bookmarks.toolbarGuid,
diff --git a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
index 532643e2faa0..50f5522eaf06 100644
--- a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
+++ b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
@@ -35,7 +35,7 @@ add_task(function* () {
 
   // The test will continue once import has finished and smart bookmarks
   // have been created.
-  yield promiseEndUpdateBatch();
+  yield promiseTopicObserved("places-browser-init-complete");
 
   let bm = yield PlacesUtils.bookmarks.fetch({
     parentGuid: PlacesUtils.bookmarks.toolbarGuid,
diff --git a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
index 035172619d12..65750a914f4a 100644
--- a/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
+++ b/browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup_default.js
@@ -33,7 +33,7 @@ add_task(function* () {
 
   // The test will continue once import has finished and smart bookmarks
   // have been created.
-  yield promiseEndUpdateBatch();
+  yield promiseTopicObserved("places-browser-init-complete");
 
   let bm = yield PlacesUtils.bookmarks.fetch({
     parentGuid: PlacesUtils.bookmarks.toolbarGuid,
diff --git a/browser/components/places/tests/unit/test_browserGlue_migrate.js b/browser/components/places/tests/unit/test_browserGlue_migrate.js
index 5d3ec13e1112..817f10c81a60 100644
--- a/browser/components/places/tests/unit/test_browserGlue_migrate.js
+++ b/browser/components/places/tests/unit/test_browserGlue_migrate.js
@@ -40,7 +40,7 @@ add_task(function* test_migrate_bookmarks() {
     title: "migrated"
   });
 
-  let promise = promiseEndUpdateBatch();
+  let promise = promiseTopicObserved("places-browser-init-complete");
   bg.observe(null, "initial-migration-did-import-default-bookmarks", null);
   yield promise;
 
diff --git a/browser/components/places/tests/unit/test_browserGlue_prefs.js b/browser/components/places/tests/unit/test_browserGlue_prefs.js
index 77814581445d..49dbf2b42181 100644
--- a/browser/components/places/tests/unit/test_browserGlue_prefs.js
+++ b/browser/components/places/tests/unit/test_browserGlue_prefs.js
@@ -38,11 +38,9 @@ do_register_cleanup(function () {
 
 function simulatePlacesInit() {
   do_print("Simulate Places init");
-  let promise = waitForImportAndSmartBookmarks();
-
   // Force nsBrowserGlue::_initPlaces().
   bg.observe(null, TOPIC_BROWSERGLUE_TEST, TOPICDATA_FORCE_PLACES_INIT);
-  return promise;
+  return promiseTopicObserved("places-browser-init-complete");
 }
 
 add_task(function* test_checkPreferences() {
diff --git a/browser/components/places/tests/unit/test_browserGlue_restore.js b/browser/components/places/tests/unit/test_browserGlue_restore.js
index b2614f4c5291..9482d81d46db 100644
--- a/browser/components/places/tests/unit/test_browserGlue_restore.js
+++ b/browser/components/places/tests/unit/test_browserGlue_restore.js
@@ -44,7 +44,7 @@ add_task(function* test_main() {
 
   // The test will continue once restore has finished and smart bookmarks
   // have been created.
-  yield promiseEndUpdateBatch();
+  yield promiseTopicObserved("places-browser-init-complete");
 
   let bm = yield PlacesUtils.bookmarks.fetch({
     parentGuid: PlacesUtils.bookmarks.toolbarGuid,
diff --git a/browser/components/places/tests/unit/test_browserGlue_smartBookmarks.js b/browser/components/places/tests/unit/test_browserGlue_smartBookmarks.js
index e6498ed621c3..ca66889f878f 100644
--- a/browser/components/places/tests/unit/test_browserGlue_smartBookmarks.js
+++ b/browser/components/places/tests/unit/test_browserGlue_smartBookmarks.js
@@ -70,8 +70,6 @@ add_task(function* setup() {
   Assert.ok(!Services.prefs.getBoolPref(PREF_AUTO_EXPORT_HTML));
   Assert.ok(!Services.prefs.getBoolPref(PREF_RESTORE_DEFAULT_BOOKMARKS));
   Assert.throws(() => Services.prefs.getBoolPref(PREF_IMPORT_BOOKMARKS_HTML));
-
-  yield waitForImportAndSmartBookmarks();
 });
 
 add_task(function* test_version_0() {
diff --git a/toolkit/components/places/Bookmarks.jsm b/toolkit/components/places/Bookmarks.jsm
index 7de4e67052b0..2697e6c576f6 100644
--- a/toolkit/components/places/Bookmarks.jsm
+++ b/toolkit/components/places/Bookmarks.jsm
@@ -258,7 +258,7 @@ let Bookmarks = Object.freeze({
                         , validIf: b => b.lastModified >= item.dateAdded }
         });
 
-      let db = yield DBConnPromised;
+      let db = yield PlacesUtils.promiseWrappedConnection();
       let parent;
       if (updateInfo.hasOwnProperty("parentGuid")) {
         if (item.type == this.TYPE_FOLDER) {
@@ -426,7 +426,7 @@ let Bookmarks = Object.freeze({
    * @resolves once the removal is complete.
    */
   eraseEverything: Task.async(function* () {
-    let db = yield DBConnPromised;
+    let db = yield PlacesUtils.promiseWrappedConnection();
     yield db.executeTransaction(function* () {
       const folderGuids = [this.toolbarGuid, this.menuGuid, this.unfiledGuid];
       yield removeFoldersContents(db, folderGuids);
@@ -670,29 +670,11 @@ function notify(observers, notification, args) {
   }
 }
 
-XPCOMUtils.defineLazyGetter(this, "DBConnPromised",
-  () => new Promise((resolve, reject) => {
-    Sqlite.wrapStorageConnection({ connection: PlacesUtils.history.DBConnection } )
-          .then(db => {
-      try {
-        Sqlite.shutdown.addBlocker("Places Bookmarks.jsm wrapper closing",
-                                   db.close.bind(db));
-      }
-      catch (ex) {
-        // It's too late to block shutdown, just close the connection.
-        db.close();
-        reject(ex);
-      }
-      resolve(db);
-    });
-  })
-);
-
 ////////////////////////////////////////////////////////////////////////////////
 // Update implementation.
 
 function* updateBookmark(info, item, newParent) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   let tuples = new Map();
   if (info.hasOwnProperty("lastModified"))
@@ -779,7 +761,7 @@ function* updateBookmark(info, item, newParent) {
 // Insert implementation.
 
 function* insertBookmark(item, parent) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   // If a guid was not provided, generate one, so we won't need to fetch the
   // bookmark just after having created it.
@@ -834,7 +816,7 @@ function* insertBookmark(item, parent) {
 // Fetch implementation.
 
 function* fetchBookmark(info) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   let rows = yield db.executeCached(
     `SELECT b.guid, IFNULL(p.guid, "") AS parentGuid, b.position AS 'index',
@@ -852,7 +834,7 @@ function* fetchBookmark(info) {
 }
 
 function* fetchBookmarkByPosition(info) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
   let index = info.index == Bookmarks.DEFAULT_INDEX ? null : info.index;
 
   let rows = yield db.executeCached(
@@ -874,7 +856,7 @@ function* fetchBookmarkByPosition(info) {
 }
 
 function* fetchBookmarksByURL(info) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   let rows = yield db.executeCached(
     `SELECT b.guid, IFNULL(p.guid, "") AS parentGuid, b.position AS 'index',
@@ -895,7 +877,7 @@ function* fetchBookmarksByURL(info) {
 }
 
 function* fetchBookmarksByParent(info) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   let rows = yield db.executeCached(
     `SELECT b.guid, IFNULL(p.guid, "") AS parentGuid, b.position AS 'index',
@@ -917,7 +899,7 @@ function* fetchBookmarksByParent(info) {
 // Remove implementation.
 
 function* removeBookmark(item) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   let isUntagging = item._grandParentId == PlacesUtils.tagsFolderId;
 
@@ -960,7 +942,7 @@ function* removeBookmark(item) {
 // Reorder implementation.
 
 function* reorderChildren(parent, orderedChildrenGuids) {
-  let db = yield DBConnPromised;
+  let db = yield PlacesUtils.promiseWrappedConnection();
 
   return db.executeTransaction(function* () {
     // Select all of the direct children for the given parent.
diff --git a/toolkit/components/places/PlacesCategoriesStarter.js b/toolkit/components/places/PlacesCategoriesStarter.js
index b4378396507e..b611f337e56a 100644
--- a/toolkit/components/places/PlacesCategoriesStarter.js
+++ b/toolkit/components/places/PlacesCategoriesStarter.js
@@ -36,22 +36,25 @@ function PlacesCategoriesStarter()
   Services.obs.addObserver(this, PlacesUtils.TOPIC_SHUTDOWN, false);
 
   // nsINavBookmarkObserver implementation.
-  let notify = (function () {
+  let notify = () => {
     if (!this._notifiedBookmarksSvcReady) {
+      // TODO (bug 1145424): for whatever reason, even if we remove this
+      // component from the category (and thus from the category cache we use
+      // to notify), we keep being notified.
+      this._notifiedBookmarksSvcReady = true;
       // For perf reasons unregister from the category, since no further
       // notifications are needed.
       Cc["@mozilla.org/categorymanager;1"]
         .getService(Ci.nsICategoryManager)
-        .deleteCategoryEntry("bookmarks-observer", this, false);
+        .deleteCategoryEntry("bookmark-observers", "PlacesCategoriesStarter", false);
       // Directly notify PlacesUtils, to ensure it catches the notification.
       PlacesUtils.observe(null, "bookmarks-service-ready", null);
     }
-  }).bind(this);
+  };
+
   [ "onItemAdded", "onItemRemoved", "onItemChanged", "onBeginUpdateBatch",
-    "onEndUpdateBatch", "onItemVisited",
-    "onItemMoved" ].forEach(function(aMethod) {
-      this[aMethod] = notify;
-    }, this);
+    "onEndUpdateBatch", "onItemVisited", "onItemMoved"
+  ].forEach(aMethod => this[aMethod] = notify);
 }
 
 PlacesCategoriesStarter.prototype = {
diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index 305ba3a4433f..03fc0ec4fb8a 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -27,6 +27,8 @@ this.EXPORTED_SYMBOLS = [
 
 const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
 
+Cu.importGlobalProperties(["URL"]);
+
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Services",
                                   "resource://gre/modules/Services.jsm");
@@ -73,6 +75,55 @@ function QI_node(aNode, aIID) {
 function asContainer(aNode) QI_node(aNode, Ci.nsINavHistoryContainerResultNode);
 function asQuery(aNode) QI_node(aNode, Ci.nsINavHistoryQueryResultNode);
 
+/**
+ * Sends a bookmarks notification through the given observers.
+ *
+ * @param observers
+ *        array of nsINavBookmarkObserver objects.
+ * @param notification
+ *        the notification name.
+ * @param args
+ *        array of arguments to pass to the notification.
+ */
+function notify(observers, notification, args) {
+  for (let observer of observers) {
+    try {
+      observer[notification](...args);
+    } catch (ex) {}
+  }
+}
+
+/**
+ * Sends a keyword change notification.
+ *
+ * @param url
+ *        the url to notify about.
+ * @param keyword
+ *        The keyword to notify, or empty string if a keyword was removed.
+ */
+function* notifyKeywordChange(url, keyword) {
+  // Notify bookmarks about the removal.
+  let bookmarks = [];
+  yield PlacesUtils.bookmarks.fetch({ url }, b => bookmarks.push(b));
+  // We don't want to yield in the gIgnoreKeywordNotifications section.
+  for (let bookmark of bookmarks) {
+    bookmark.id = yield PlacesUtils.promiseItemId(bookmark.guid);
+    bookmark.parentId = yield PlacesUtils.promiseItemId(bookmark.parentGuid);
+  }
+  let observers = PlacesUtils.bookmarks.getObservers();
+  gIgnoreKeywordNotifications = true;
+  for (let bookmark of bookmarks) {
+    notify(observers, "onItemChanged", [ bookmark.id, "keyword", false,
+                                         keyword,
+                                         bookmark.lastModified * 1000,
+                                         bookmark.type,
+                                         bookmark.parentId,
+                                         bookmark.guid, bookmark.parentGuid
+                                       ]);
+  }
+  gIgnoreKeywordNotifications = false;
+}
+
 this.PlacesUtils = {
   // Place entries that are containers, e.g. bookmark folders or queries.
   TYPE_X_MOZ_PLACE_CONTAINER: "text/x-moz-place-container",
@@ -244,6 +295,11 @@ this.PlacesUtils = {
           let observerInfo = this._bookmarksServiceObserversQueue.shift();
           this.bookmarks.addObserver(observerInfo.observer, observerInfo.weak);
         }
+
+        // Initialize the keywords cache to start observing bookmarks
+        // notifications.  This is needed as far as we support both the old and
+        // the new bookmarking APIs at the same time.
+        gKeywordsCachePromise.catch(Cu.reportError);
         break;
     }
   },
@@ -810,19 +866,19 @@ this.PlacesUtils = {
    * Set the POST data associated with a bookmark, if any.
    * Used by POST keywords.
    *   @param aBookmarkId
-   *   @returns string of POST data
    */
   setPostDataForBookmark(aBookmarkId, aPostData) {
+    if (!aPostData)
+      throw new Error("Must provide valid POST data");
     // For now we don't have a unified API to create a keyword with postData,
     // thus here we can just try to complete a keyword that should already exist
     // without any post data.
-    let nullPostDataFragment = aPostData ? "AND post_data ISNULL" : "";
     let stmt = PlacesUtils.history.DBConnection.createStatement(
       `UPDATE moz_keywords SET post_data = :post_data
        WHERE id = (SELECT k.id FROM moz_keywords k
                    JOIN moz_bookmarks b ON b.fk = k.place_id
                    WHERE b.id = :item_id
-                   ${nullPostDataFragment}
+                   AND post_data ISNULL
                    LIMIT 1)`);
     stmt.params.item_id = aBookmarkId;
     stmt.params.post_data = aPostData;
@@ -832,6 +888,21 @@ this.PlacesUtils = {
     finally {
       stmt.finalize();
     }
+
+    // Update the cache.
+    return Task.spawn(function* () {
+      let guid = yield PlacesUtils.promiseItemGuid(aBookmarkId);
+      let bm = yield PlacesUtils.bookmarks.fetch(guid);
+
+      // Fetch keywords for this href.
+      let cache = yield gKeywordsCachePromise;
+      for (let [ keyword, entry ] of cache) {
+        // Set the POST data on keywords not having it.
+        if (entry.url.href == bm.url.href && !entry.postData) {
+          entry.postData = aPostData;
+        }
+      }
+    }).catch(Cu.reportError);
   },
 
   /**
@@ -1256,6 +1327,14 @@ this.PlacesUtils = {
    */
   promiseDBConnection: () => gAsyncDBConnPromised,
 
+  /**
+   * Gets a Sqlite.jsm wrapped connection to the Places database.
+   * This is intended to be used mostly internally, and by other Places modules.
+   * Keep in mind the Places DB schema is by no means frozen or even stable.
+   * Your custom queries can - and will - break overtime.
+   */
+  promiseWrappedConnection: () => gAsyncDBWrapperPromised,
+
   /**
    * Given a uri returns list of itemIds associated to it.
    *
@@ -1842,6 +1921,8 @@ XPCOMUtils.defineLazyServiceGetter(PlacesUtils, "livemarks",
                                    "@mozilla.org/browser/livemark-service;2",
                                    "mozIAsyncLivemarks");
 
+XPCOMUtils.defineLazyGetter(PlacesUtils, "keywords", () => Keywords);
+
 XPCOMUtils.defineLazyGetter(PlacesUtils, "transactionManager", function() {
   let tm = Cc["@mozilla.org/transactionmanager;1"].
            createInstance(Ci.nsITransactionManager);
@@ -1881,24 +1962,266 @@ XPCOMUtils.defineLazyGetter(this, "bundle", function() {
          createBundle(PLACES_STRING_BUNDLE_URI);
 });
 
-XPCOMUtils.defineLazyGetter(this, "gAsyncDBConnPromised", () => {
-  let connPromised = Sqlite.cloneStorageConnection({
-    connection: PlacesUtils.history.DBConnection,
-    readOnly:   true });
-  connPromised.then(conn => {
-    try {
-      Sqlite.shutdown.addBlocker("Places DB readonly connection closing",
-                                 conn.close.bind(conn));
+XPCOMUtils.defineLazyGetter(this, "gAsyncDBConnPromised",
+  () => new Promise((resolve) => {
+    Sqlite.cloneStorageConnection({
+      connection: PlacesUtils.history.DBConnection,
+      readOnly:   true
+    }).then(conn => {
+      try {
+        Sqlite.shutdown.addBlocker(
+          "PlacesUtils read-only connection closing",
+          conn.close.bind(conn));
+      } catch(ex) {
+        // It's too late to block shutdown, just close the connection.
+        conn.close();
+        throw ex;
+      }
+      resolve(conn);
+    });
+  })
+);
+
+XPCOMUtils.defineLazyGetter(this, "gAsyncDBWrapperPromised",
+  () => new Promise((resolve) => {
+    Sqlite.wrapStorageConnection({
+      connection: PlacesUtils.history.DBConnection,
+    }).then(conn => {
+      try {
+        Sqlite.shutdown.addBlocker(
+          "PlacesUtils wrapped connection closing",
+          conn.close.bind(conn));
+      } catch(ex) {
+        // It's too late to block shutdown, just close the connection.
+        conn.close();
+        throw ex;
+      }
+      resolve(conn);
+    });
+  })
+);
+
+/**
+ * Keywords management API.
+ * Sooner or later these keywords will merge with search keywords, this is an
+ * interim API that should then be replaced by a unified one.
+ * Keywords are associated with URLs and can have POST data.
+ * A single URL can have multiple keywords, provided they differ by POST data.
+ */
+let Keywords = {
+  /**
+   * Fetches URL and postData for a given keyword.
+   *
+   * @param keyword
+   *        The keyword to fetch.
+   * @return {Promise}
+   * @resolves to an object in the form: { keyword, url, postData },
+   *           or null if a keyword was not found.
+   */
+  fetch(keyword) {
+    if (!keyword || typeof(keyword) != "string")
+      throw new Error("Invalid keyword");
+    keyword = keyword.trim().toLowerCase();
+    return gKeywordsCachePromise.then(cache => cache.get(keyword) || null);
+  },
+
+  /**
+   * Adds a new keyword and postData for the given URL.
+   *
+   * @param keywordEntry
+   *        An object describing the keyword to insert, in the form:
+   *        {
+   *          keyword: non-empty string,
+   *          URL: URL or href to associate to the keyword,
+   *          postData: optional POST data to associate to the keyword
+   *        }
+   * @note Do not define a postData property if there isn't any POST data.
+   * @resolves when the addition is complete.
+   */
+  insert(keywordEntry) {
+    if (!keywordEntry || typeof keywordEntry != "object")
+      throw new Error("Input should be a valid object");
+
+    if (!("keyword" in keywordEntry) || !keywordEntry.keyword ||
+        typeof(keywordEntry.keyword) != "string")
+      throw new Error("Invalid keyword");
+    if (("postData" in keywordEntry) && keywordEntry.postData &&
+                                        typeof(keywordEntry.postData) != "string")
+      throw new Error("Invalid POST data");
+    if (!("url" in keywordEntry))
+      throw new Error("undefined is not a valid URL");
+    let { keyword, url } = keywordEntry;
+    keyword = keyword.trim().toLowerCase();
+    let postData = keywordEntry.postData || null;
+    // This also checks href for validity
+    url = new URL(url);
+
+    return Task.spawn(function* () {
+      let cache = yield gKeywordsCachePromise;
+
+      // Trying to set the same keyword is a no-op.
+      let oldEntry = cache.get(keyword);
+      if (oldEntry && oldEntry.url.href == url.href &&
+                      oldEntry.postData == keywordEntry.postData) {
+        return;
+      }
+
+      // A keyword can only be associated to a single page.
+      // If another page is using the new keyword, we must update the keyword
+      // entry.
+      // Note we cannot use INSERT OR REPLACE cause it wouldn't invoke the delete
+      // trigger.
+      let db = yield PlacesUtils.promiseWrappedConnection();
+      if (oldEntry) {
+        yield db.executeCached(
+          `UPDATE moz_keywords
+           SET place_id = (SELECT id FROM moz_places WHERE url = :url),
+               post_data = :post_data
+           WHERE keyword = :keyword
+          `, { url: url.href, keyword: keyword, post_data: postData });
+        yield notifyKeywordChange(oldEntry.url.href, "");
+      } else {
+        // An entry for the given page could be missing, in such a case we need to
+        // create it.
+        yield db.executeCached(
+          `INSERT OR IGNORE INTO moz_places (url, rev_host, hidden, frecency, guid)
+           VALUES (:url, :rev_host, 0, :frecency, GENERATE_GUID())
+          `, { url: url.href, rev_host: PlacesUtils.getReversedHost(url),
+               frecency: url.protocol == "place:" ? 0 : -1 });
+        yield db.executeCached(
+          `INSERT INTO moz_keywords (keyword, place_id, post_data)
+           VALUES (:keyword, (SELECT id FROM moz_places WHERE url = :url), :post_data)
+          `, { url: url.href, keyword: keyword, post_data: postData });
+      }
+
+      cache.set(keyword, { keyword, url, postData });
+
+      // In any case, notify about the new keyword.
+      yield notifyKeywordChange(url.href, keyword);
+    }.bind(this));
+  },
+
+  /**
+   * Removes a keyword.
+   *
+   * @param keyword
+   *        The keyword to remove.
+   * @return {Promise}
+   * @resolves when the removal is complete.
+   */
+  remove(keyword) {
+    if (!keyword || typeof(keyword) != "string")
+      throw new Error("Invalid keyword");
+    keyword = keyword.trim().toLowerCase();
+    return Task.spawn(function* () {
+      let cache = yield gKeywordsCachePromise;
+      if (!cache.has(keyword))
+        return;
+      let { url } = cache.get(keyword);
+      cache.delete(keyword);
+
+      let db = yield PlacesUtils.promiseWrappedConnection();
+      yield db.execute(`DELETE FROM moz_keywords WHERE keyword = :keyword`,
+                       { keyword });
+
+      // Notify bookmarks about the removal.
+      yield notifyKeywordChange(url.href, "");
+    }.bind(this));
+  }
+};
+
+// Set by the keywords API to distinguish notifications fired by the old API.
+// Once the old API will be gone, we can remove this and stop observing.
+let gIgnoreKeywordNotifications = false;
+
+XPCOMUtils.defineLazyGetter(this, "gKeywordsCachePromise", Task.async(function* () {
+  let cache = new Map();
+  let db = yield PlacesUtils.promiseWrappedConnection();
+  let rows = yield db.execute(
+    `SELECT keyword, url, post_data
+     FROM moz_keywords k
+     JOIN moz_places h ON h.id = k.place_id
+    `);
+  for (let row of rows) {
+    let keyword = row.getResultByName("keyword");
+    let entry = { keyword,
+                  url: new URL(row.getResultByName("url")),
+                  postData: row.getResultByName("post_data") };
+    cache.set(keyword, entry);
+  }
+
+  // Helper to get a keyword from an href.
+  function keywordsForHref(href) {
+    let keywords = [];
+    for (let [ key, val ] of cache) {
+      if (val.url.href == href)
+        keywords.push(key);
     }
-    catch(ex) {
-      // It's too late to block shutdown, just close the connection.
-      return conn.close();
-      throw (ex);
+    return keywords;
+  }
+
+  // Start observing changes to bookmarks. For now we are going to keep that
+  // relation for backwards compatibility reasons, but mostly because we are
+  // lacking a UI to manage keywords directly.
+  let observer = {
+    QueryInterface: XPCOMUtils.generateQI(Ci.nsINavBookmarkObserver),
+    onBeginUpdateBatch() {},
+    onEndUpdateBatch() {},
+    onItemAdded() {},
+    onItemVisited() {},
+    onItemMoved() {},
+
+    onItemRemoved(id, parentId, index, itemType, uri, guid, parentGuid) {
+      if (itemType != PlacesUtils.bookmarks.TYPE_BOOKMARK)
+        return;
+
+      let keywords = keywordsForHref(uri.spec);
+      // This uri has no keywords associated, so there's nothing to do.
+      if (keywords.length == 0)
+        return;
+
+      Task.spawn(function* () {
+        // If the uri is not bookmarked anymore, we can remove this keyword.
+        let bookmark = yield PlacesUtils.bookmarks.fetch({ url: uri });
+        if (!bookmark) {
+          for (let keyword of keywords) {
+            yield PlacesUtils.keywords.remove(keyword);
+          }
+        }
+      }).catch(Cu.reportError);
+    },
+
+    onItemChanged(id, prop, isAnno, val, lastMod, itemType, parentId, guid) {
+      if (gIgnoreKeywordNotifications ||
+          prop != "keyword")
+        return;
+
+      Task.spawn(function* () {
+        let bookmark = yield PlacesUtils.bookmarks.fetch(guid);
+        // By this time the bookmark could have gone, there's nothing we can do.
+        if (!bookmark)
+          return;
+
+        if (val.length == 0) {
+          // We are removing a keyword.
+          let keywords = keywordsForHref(bookmark.url.href)
+          for (let keyword of keywords) {
+            cache.delete(keyword);
+          }
+        } else {
+          // We are adding a new keyword.
+          cache.set(val, { keyword: val, url: bookmark.url });
+        }
+      }).catch(Cu.reportError);
     }
-    return Promise.resolve();
-  }).then(null, Cu.reportError);
-  return connPromised;
-});
+  };
+
+  PlacesUtils.bookmarks.addObserver(observer, false);
+  PlacesUtils.registerShutdownFunction(() => {
+    PlacesUtils.bookmarks.removeObserver(observer);
+  });
+  return cache;
+}));
 
 // Sometime soon, likely as part of the transition to mozIAsyncBookmarks,
 // itemIds will be deprecated in favour of GUIDs, which play much better
@@ -2919,15 +3242,19 @@ this.PlacesEditBookmarkPostDataTransaction =
 PlacesEditBookmarkPostDataTransaction.prototype = {
   __proto__: BaseTransaction.prototype,
 
-  doTransaction: function EBPDTXN_doTransaction()
-  {
-    this.item.postData = PlacesUtils.getPostDataForBookmark(this.item.id);
-    PlacesUtils.setPostDataForBookmark(this.item.id, this.new.postData);
+  doTransaction() {
+    // Setting null postData is not supported by the current schema.
+    if (this.new.postData) {
+      this.item.postData = PlacesUtils.getPostDataForBookmark(this.item.id);
+      PlacesUtils.setPostDataForBookmark(this.item.id, this.new.postData);
+    }
   },
 
-  undoTransaction: function EBPDTXN_undoTransaction()
-  {
-    PlacesUtils.setPostDataForBookmark(this.item.id, this.item.postData);
+  undoTransaction() {
+    // Setting null postData is not supported by the current schema.
+    if (this.item.postData) {
+      PlacesUtils.setPostDataForBookmark(this.item.id, this.item.postData);
+    }
   }
 };
 
diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp
index 7161ca458c82..c66116dd00ad 100644
--- a/toolkit/components/places/nsNavBookmarks.cpp
+++ b/toolkit/components/places/nsNavBookmarks.cpp
@@ -622,13 +622,8 @@ nsNavBookmarks::RemoveItem(int64_t aItemId)
       rv = history->UpdateFrecency(bookmark.placeId);
       NS_ENSURE_SUCCESS(rv, rv);
     }
-
     // A broken url should not interrupt the removal process.
-    rv = NS_NewURI(getter_AddRefs(uri), bookmark.url);
-    if (NS_SUCCEEDED(rv)) {
-      rv = UpdateKeywordsForRemovedBookmark(bookmark);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
+    (void)NS_NewURI(getter_AddRefs(uri), bookmark.url);
   }
 
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
@@ -1102,13 +1097,8 @@ nsNavBookmarks::RemoveFolderChildren(int64_t aFolderId)
         rv = history->UpdateFrecency(child.placeId);
         NS_ENSURE_SUCCESS(rv, rv);
       }
-
       // A broken url should not interrupt the removal process.
-      rv = NS_NewURI(getter_AddRefs(uri), child.url);
-      if (NS_SUCCEEDED(rv)) {
-        rv = UpdateKeywordsForRemovedBookmark(child);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
+      (void)NS_NewURI(getter_AddRefs(uri), child.url);
     }
 
     NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
@@ -2238,74 +2228,6 @@ nsNavBookmarks::SetItemIndex(int64_t aItemId, int32_t aNewIndex)
 }
 
 
-nsresult
-nsNavBookmarks::UpdateKeywordsForRemovedBookmark(const BookmarkData& aBookmark)
-{
-  // If there are no keywords for this URI, there's nothing to do.
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = NS_NewURI(getter_AddRefs(uri), aBookmark.url);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsTArray<nsString> keywords;
-  {
-    nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
-      "SELECT keyword FROM moz_keywords WHERE place_id = :place_id "
-    );
-    NS_ENSURE_STATE(stmt);
-    mozStorageStatementScoper scoper(stmt);
-    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("place_id"), aBookmark.placeId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    bool hasMore;
-    while (NS_SUCCEEDED(stmt->ExecuteStep(&hasMore)) && hasMore) {
-      nsAutoString keyword;
-      rv = stmt->GetString(0, keyword);
-      NS_ENSURE_SUCCESS(rv, rv);
-      keywords.AppendElement(keyword);
-    }
-  }
-
-  if (keywords.Length() == 0) {
-    // This uri has no keywords associated, so there's nothing to do.
-    return NS_OK;
-  }
-
-  // If the uri is not bookmarked anymore, we can remove its keywords.
-  nsTArray<BookmarkData> bookmarks;
-  rv = GetBookmarksForURI(uri, bookmarks);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (bookmarks.Length() == 0) {
-    for (uint32_t i = 0; i < keywords.Length(); ++i) {
-      nsString keyword = keywords[i];
-
-      nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
-        "DELETE FROM moz_keywords WHERE keyword = :keyword "
-      );
-      NS_ENSURE_STATE(stmt);
-      mozStorageStatementScoper scoper(stmt);
-      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("keyword"), keyword);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->Execute();
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
-                     nsINavBookmarkObserver,
-                     OnItemChanged(aBookmark.id,
-                                   NS_LITERAL_CSTRING("keyword"),
-                                   false,
-                                   EmptyCString(),
-                                   aBookmark.lastModified,
-                                   TYPE_BOOKMARK,
-                                   aBookmark.parentId,
-                                   aBookmark.guid,
-                                   aBookmark.parentGuid));
-  }
-
-  return NS_OK;
-}
-
-
 NS_IMETHODIMP
 nsNavBookmarks::SetKeywordForBookmark(int64_t aBookmarkId,
                                       const nsAString& aUserCasedKeyword)
diff --git a/toolkit/components/places/tests/bookmarks/test_bookmarks.js b/toolkit/components/places/tests/bookmarks/test_bookmarks.js
index cc4dfdd029b0..8911f68a5805 100644
--- a/toolkit/components/places/tests/bookmarks/test_bookmarks.js
+++ b/toolkit/components/places/tests/bookmarks/test_bookmarks.js
@@ -321,31 +321,25 @@ add_task(function test_bookmarks() {
   // test setKeywordForBookmark
   let kwTestItemId = bs.insertBookmark(testRoot, uri("http://keywordtest.com"),
                                        bs.DEFAULT_INDEX, "");
-  try {
-    let dateAdded = bs.getItemDateAdded(kwTestItemId);
-    // after just inserting, modified should not be set
-    let lastModified = bs.getItemLastModified(kwTestItemId);
-    do_check_eq(lastModified, dateAdded);
 
-    // Workaround possible VM timers issues moving lastModified and dateAdded
-    // to the past.
-    lastModified -= 1000;
-    bs.setItemLastModified(kwTestItemId, --lastModified);
-    dateAdded -= 1000;
-    bs.setItemDateAdded(kwTestItemId, dateAdded);
-
-    bs.setKeywordForBookmark(kwTestItemId, "bar");
-
-    let lastModified2 = bs.getItemLastModified(kwTestItemId);
-    LOG("test setKeywordForBookmark");
-    LOG("dateAdded = " + dateAdded);
-    LOG("lastModified = " + lastModified);
-    LOG("lastModified2 = " + lastModified2);
-    do_check_true(is_time_ordered(lastModified, lastModified2));
-    do_check_true(is_time_ordered(dateAdded, lastModified2));
-  } catch(ex) {
-    do_throw("setKeywordForBookmark: " + ex);
-  }
+  dateAdded = bs.getItemDateAdded(kwTestItemId);
+  // after just inserting, modified should not be set
+  lastModified = bs.getItemLastModified(kwTestItemId);
+  do_check_eq(lastModified, dateAdded);
+  // Workaround possible VM timers issues moving lastModified and dateAdded
+  // to the past.
+  lastModified -= 1000;
+  bs.setItemLastModified(kwTestItemId, lastModified);
+  dateAdded -= 1000;
+  bs.setItemDateAdded(kwTestItemId, dateAdded);
+  bs.setKeywordForBookmark(kwTestItemId, "bar");
+  lastModified2 = bs.getItemLastModified(kwTestItemId);
+  LOG("test setKeywordForBookmark");
+  LOG("dateAdded = " + dateAdded);
+  LOG("lastModified = " + lastModified);
+  LOG("lastModified2 = " + lastModified2);
+  do_check_true(is_time_ordered(lastModified, lastModified2));
+  do_check_true(is_time_ordered(dateAdded, lastModified2));
 
   let lastModified3 = bs.getItemLastModified(kwTestItemId);
   // test getKeywordForBookmark
diff --git a/toolkit/components/places/tests/bookmarks/test_keywords.js b/toolkit/components/places/tests/bookmarks/test_keywords.js
index 242fa4977e0d..b3e728b89a7f 100644
--- a/toolkit/components/places/tests/bookmarks/test_keywords.js
+++ b/toolkit/components/places/tests/bookmarks/test_keywords.js
@@ -286,17 +286,12 @@ add_task(function test_addRemoveBookmark() {
                                   "keyword", false, "keyword",
                                   bookmark.lastModified, bookmark.type,
                                   parentId,
-                                  bookmark.guid, bookmark.parentGuid ] },
-                    { name: "onItemChanged",
-                     arguments: [ itemId,
-                                  "keyword", false, "",
-                                  bookmark.lastModified, bookmark.type,
-                                  parentId,
                                   bookmark.guid, bookmark.parentGuid ] }
                  ]);
 
   check_keyword(URI3, null);
-  Assert.equal((yield foreign_count(URI3)), fc);
+  // Don't check the foreign count since the process is async.
+  // The new test_keywords.js in unit is checking this though.
 
   yield PlacesTestUtils.promiseAsyncUpdates();
   check_orphans();
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
index 62fb1a97f75c..6b1d516631a9 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_keyword_search.js
@@ -48,7 +48,7 @@ add_task(function* test_keyword_searc() {
   do_print("Keyword that happens to match a page");
   yield check_autocomplete({
     search: "key ThisPageIsInHistory",
-    matches: [ { uri: NetUtil.newURI("http://abc/?search=ThisPageIsInHistory"), title: "Generic page title", style: ["bookmark"] } ]
+    matches: [ { uri: NetUtil.newURI("http://abc/?search=ThisPageIsInHistory"), title: "Generic page title", style: ["keyword"] } ]
   });
 
   do_print("Keyword without query (without space)");
diff --git a/toolkit/components/places/tests/unit/test_421180.js b/toolkit/components/places/tests/unit/test_421180.js
deleted file mode 100644
index 69cac5662abd..000000000000
--- a/toolkit/components/places/tests/unit/test_421180.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// Get bookmarks service
-try {
-  var bmsvc = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
-              getService(Ci.nsINavBookmarksService);
-}
-catch(ex) {
-  do_throw("Could not get bookmarks service\n");
-}
-
-// Get database connection
-try {
-  var histsvc = Cc["@mozilla.org/browser/nav-history-service;1"].
-                getService(Ci.nsINavHistoryService);
-  var mDBConn = histsvc.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
-}
-catch(ex) {
-  do_throw("Could not get database connection\n");
-}
-
-add_test(function test_keywordRemovedOnUniqueItemRemoval() {
-  var bookmarkedURI = uri("http://foo.bar");
-  var keyword = "testkeyword";
-
-  // TEST 1
-  // 1. add a bookmark
-  // 2. add a keyword to it
-  // 3. remove bookmark
-  // 4. check that keyword has gone
-  var bookmarkId = bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder,
-                                        bookmarkedURI,
-                                        bmsvc.DEFAULT_INDEX,
-                                        "A bookmark");
-  bmsvc.setKeywordForBookmark(bookmarkId, keyword);
-  // remove bookmark
-  bmsvc.removeItem(bookmarkId);
-
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    // Check that keyword has been removed from the database.
-    // The removal is asynchronous.
-    var sql = "SELECT id FROM moz_keywords WHERE keyword = ?1";
-    var stmt = mDBConn.createStatement(sql);
-    stmt.bindByIndex(0, keyword);
-    do_check_false(stmt.executeStep());
-    stmt.finalize();
-
-    run_next_test();
-  });
-});
-
-add_test(function test_keywordNotRemovedOnNonUniqueItemRemoval() {
-  var bookmarkedURI = uri("http://foo.bar");
-  var keyword = "testkeyword";
-
-  // TEST 2
-  // 1. add 2 bookmarks
-  // 2. add the same keyword to them
-  // 3. remove first bookmark
-  // 4. check that keyword is still there
-  var bookmarkId1 = bmsvc.insertBookmark(bmsvc.bookmarksMenuFolder,
-                                        bookmarkedURI,
-                                        bmsvc.DEFAULT_INDEX,
-                                        "A bookmark");
-  bmsvc.setKeywordForBookmark(bookmarkId1, keyword);
-
-  var bookmarkId2 = bmsvc.insertBookmark(bmsvc.toolbarFolder,
-                                        bookmarkedURI,
-                                        bmsvc.DEFAULT_INDEX,
-                                        keyword);
-  bmsvc.setKeywordForBookmark(bookmarkId2, keyword);
-
-  // remove first bookmark
-  bmsvc.removeItem(bookmarkId1);
-
-  PlacesTestUtils.promiseAsyncUpdates().then(() => {
-    // check that keyword is still there
-    var sql = "SELECT id FROM moz_keywords WHERE keyword = ?1";
-    var stmt = mDBConn.createStatement(sql);
-    stmt.bindByIndex(0, keyword);
-    do_check_true(stmt.executeStep());
-    stmt.finalize();
-
-    run_next_test();
-  });
-});
-
-function run_test() {
-  run_next_test();
-}
diff --git a/toolkit/components/places/tests/unit/test_keywords.js b/toolkit/components/places/tests/unit/test_keywords.js
new file mode 100644
index 000000000000..90cf8fba266e
--- /dev/null
+++ b/toolkit/components/places/tests/unit/test_keywords.js
@@ -0,0 +1,488 @@
+"use strict"
+
+function* check_keyword(aExpectExists, aHref, aKeyword, aPostData = null) {
+  // Check case-insensitivity.
+  aKeyword = aKeyword.toUpperCase();
+
+  let entry = yield PlacesUtils.keywords.fetch(aKeyword);
+  if (aExpectExists) {
+    Assert.ok(!!entry, "A keyword should exist");
+    Assert.equal(entry.url.href, aHref);
+    Assert.equal(entry.postData, aPostData);
+  } else {
+    Assert.ok(!entry || entry.url.href != aHref,
+              "The given keyword entry should not exist");
+  }
+}
+
+/**
+ * Polls the keywords cache waiting for the given keyword entry.
+ */
+function* promiseKeyword(keyword, expectedHref) {
+  let href = null;
+  do {
+    yield new Promise(resolve => do_timeout(100, resolve));
+    let entry = yield PlacesUtils.keywords.fetch(keyword);
+    if (entry)
+      href = entry.url.href; 
+  } while (href != expectedHref);
+}
+
+function* check_no_orphans() {
+  let db = yield PlacesUtils.promiseDBConnection();
+  let rows = yield db.executeCached(
+    `SELECT id FROM moz_keywords k
+     WHERE NOT EXISTS (SELECT 1 FROM moz_places WHERE id = k.place_id)
+    `);
+  Assert.equal(rows.length, 0);
+}
+
+function expectBookmarkNotifications() {
+  let notifications = [];
+  let observer = new Proxy(NavBookmarkObserver, {
+    get(target, name) {
+      if (name == "check") {
+        PlacesUtils.bookmarks.removeObserver(observer);
+        return expectedNotifications =>
+          Assert.deepEqual(notifications, expectedNotifications);
+      }
+
+      if (name.startsWith("onItemChanged")) {
+        return (itemId, property) => {
+          if (property != "keyword")
+            return;
+          let args = Array.from(arguments, arg => {
+            if (arg && arg instanceof Ci.nsIURI)
+              return new URL(arg.spec);
+            if (arg && typeof(arg) == "number" && arg >= Date.now() * 1000)
+              return new Date(parseInt(arg/1000));
+            return arg;
+          });
+          notifications.push({ name: name, arguments: args });
+        }
+      }
+
+      if (name in target)
+        return target[name];
+      return undefined;
+    }
+  });
+  PlacesUtils.bookmarks.addObserver(observer, false);
+  return observer;
+}
+
+add_task(function* test_invalid_input() {
+  Assert.throws(() => PlacesUtils.keywords.fetch(null),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.fetch(""),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.fetch(5),
+                /Invalid keyword/);
+
+  Assert.throws(() => PlacesUtils.keywords.insert(null),
+                /Input should be a valid object/);
+  Assert.throws(() => PlacesUtils.keywords.insert("test"),
+                /Input should be a valid object/);
+  Assert.throws(() => PlacesUtils.keywords.insert(undefined),
+                /Input should be a valid object/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ }),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: null }),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: 5 }),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "" }),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test", postData: 5 }),
+                /Invalid POST data/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test", postData: {} }),
+                /Invalid POST data/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test" }),
+                /is not a valid URL/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test", url: 5 }),
+                /is not a valid URL/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test", url: "" }),
+                /is not a valid URL/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test", url: null }),
+                /is not a valid URL/);
+  Assert.throws(() => PlacesUtils.keywords.insert({ keyword: "test", url: "mozilla" }),
+                /is not a valid URL/);
+
+  Assert.throws(() => PlacesUtils.keywords.remove(null),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.remove(""),
+                /Invalid keyword/);
+  Assert.throws(() => PlacesUtils.keywords.remove(5),
+                /Invalid keyword/);
+});
+
+add_task(function* test_addKeyword() {
+  yield check_keyword(false, "http://example.com/", "keyword");
+  let fc = yield foreign_count("http://example.com/");
+  let observer = expectBookmarkNotifications();
+
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+  observer.check([]);
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 1); // +1 keyword
+
+  // Now remove the keyword.
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.remove("keyword");
+  observer.check([]);
+
+  yield check_keyword(false, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc); // -1 keyword
+
+  // Check using URL.
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: new URL("http://example.com/") });
+  yield check_keyword(true, "http://example.com/", "keyword");
+  yield PlacesUtils.keywords.remove("keyword");
+  yield check_keyword(false, "http://example.com/", "keyword");
+
+  yield check_no_orphans();
+});
+
+add_task(function* test_addBookmarkAndKeyword() {
+  yield check_keyword(false, "http://example.com/", "keyword");
+  let fc = yield foreign_count("http://example.com/");
+  let bookmark = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                      type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                      parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+
+  let observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark.guid)),
+                                 "keyword", false, "keyword",
+                                 bookmark.lastModified, bookmark.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark.parentGuid)),
+                                 bookmark.guid, bookmark.parentGuid ] } ]);
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 2); // +1 bookmark +1 keyword
+
+  // Now remove the keyword.
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.remove("keyword");
+
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark.guid)),
+                                 "keyword", false, "",
+                                 bookmark.lastModified, bookmark.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark.parentGuid)),
+                                 bookmark.guid, bookmark.parentGuid ] } ]);
+
+  yield check_keyword(false, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 1); // -1 keyword
+
+  // Add again the keyword, then remove the bookmark.
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.bookmarks.remove(bookmark.guid);
+  // the notification is synchronous but the removal process is async.
+  // Unfortunately there's nothing explicit we can wait for.
+  while ((yield foreign_count("http://example.com/")));
+  // We don't get any itemChanged notification since the bookmark has been
+  // removed already.
+  observer.check([]);
+
+  yield check_keyword(false, "http://example.com/", "keyword");
+
+  yield check_no_orphans();
+});
+
+add_task(function* test_addKeywordToURIHavingKeyword() {
+  yield check_keyword(false, "http://example.com/", "keyword");
+  let fc = yield foreign_count("http://example.com/");
+
+  let observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+  observer.check([]);
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 1); // +1 keyword
+
+  yield PlacesUtils.keywords.insert({ keyword: "keyword2", url: "http://example.com/" });
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  yield check_keyword(true, "http://example.com/", "keyword2");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 2); // +1 keyword
+
+  // Now remove the keywords.
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.remove("keyword");
+  yield PlacesUtils.keywords.remove("keyword2");
+  observer.check([]);
+
+  yield check_keyword(false, "http://example.com/", "keyword");
+  yield check_keyword(false, "http://example.com/", "keyword2");
+  Assert.equal((yield foreign_count("http://example.com/")), fc); // -1 keyword
+
+  yield check_no_orphans();
+});
+
+add_task(function* test_addBookmarkToURIHavingKeyword() {
+  yield check_keyword(false, "http://example.com/", "keyword");
+  let fc = yield foreign_count("http://example.com/");
+  let observer = expectBookmarkNotifications();
+
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+  observer.check([]);
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 1); // +1 keyword
+
+  observer = expectBookmarkNotifications();
+  let bookmark = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                      type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                      parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 2); // +1 bookmark
+  observer.check([]);
+
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.bookmarks.remove(bookmark.guid);
+  // the notification is synchronous but the removal process is async.
+  // Unfortunately there's nothing explicit we can wait for.
+  while ((yield foreign_count("http://example.com/")));
+  // We don't get any itemChanged notification since the bookmark has been
+  // removed already.
+  observer.check([]);
+
+  yield check_keyword(false, "http://example.com/", "keyword");
+
+  yield check_no_orphans();
+});
+
+add_task(function* test_sameKeywordDifferentURL() {
+  let fc1 = yield foreign_count("http://example1.com/");
+  let bookmark1 = yield PlacesUtils.bookmarks.insert({ url: "http://example1.com/",
+                                                       type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                       parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  let fc2 = yield foreign_count("http://example2.com/");
+  let bookmark2 = yield PlacesUtils.bookmarks.insert({ url: "http://example2.com/",
+                                                       type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                       parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example1.com/" });
+
+  yield check_keyword(true, "http://example1.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example1.com/")), fc1 + 2); // +1 bookmark +1 keyword
+  yield check_keyword(false, "http://example2.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example2.com/")), fc2 + 1); // +1 bookmark
+
+  // Assign the same keyword to another url.
+  let observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example2.com/" });
+
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark1.guid)),
+                                 "keyword", false, "",
+                                 bookmark1.lastModified, bookmark1.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark1.parentGuid)),
+                                 bookmark1.guid, bookmark1.parentGuid ] },
+                  { name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark2.guid)),
+                                 "keyword", false, "keyword",
+                                 bookmark2.lastModified, bookmark2.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark2.parentGuid)),
+                                 bookmark2.guid, bookmark2.parentGuid ] } ]);
+
+  yield check_keyword(false, "http://example1.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example1.com/")), fc1 + 1); // -1 keyword
+  yield check_keyword(true, "http://example2.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example2.com/")), fc2 + 2); // +1 keyword
+
+  // Now remove the keyword.
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.remove("keyword");
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark2.guid)),
+                                 "keyword", false, "",
+                                 bookmark2.lastModified, bookmark2.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark2.parentGuid)),
+                                 bookmark2.guid, bookmark2.parentGuid ] } ]);
+
+  yield check_keyword(false, "http://example1.com/", "keyword");
+  yield check_keyword(false, "http://example2.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example1.com/")), fc1 + 1);
+  Assert.equal((yield foreign_count("http://example2.com/")), fc2 + 1); // -1 keyword
+
+  yield PlacesUtils.bookmarks.remove(bookmark1);
+  yield PlacesUtils.bookmarks.remove(bookmark2);
+  Assert.equal((yield foreign_count("http://example1.com/")), fc1); // -1 bookmark
+  while ((yield foreign_count("http://example2.com/"))); // -1 keyword
+
+  yield check_no_orphans();
+});
+
+add_task(function* test_sameURIDifferentKeyword() {
+  let fc = yield foreign_count("http://example.com/");
+
+  let observer = expectBookmarkNotifications();
+  let bookmark = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                      type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                      parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  yield PlacesUtils.keywords.insert({keyword: "keyword", url: "http://example.com/" });
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 2); // +1 bookmark +1 keyword
+
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark.guid)),
+                                 "keyword", false, "keyword",
+                                 bookmark.lastModified, bookmark.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark.parentGuid)),
+                                 bookmark.guid, bookmark.parentGuid ] } ]);
+
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.insert({ keyword: "keyword2", url: "http://example.com/" });
+  yield check_keyword(true, "http://example.com/", "keyword");
+  yield check_keyword(true, "http://example.com/", "keyword2");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 3); // +1 keyword
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark.guid)),
+                                 "keyword", false, "keyword2",
+                                 bookmark.lastModified, bookmark.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark.parentGuid)),
+                                 bookmark.guid, bookmark.parentGuid ] } ]);
+
+  // Add a third keyword.
+  yield PlacesUtils.keywords.insert({ keyword: "keyword3", url: "http://example.com/" });
+  yield check_keyword(true, "http://example.com/", "keyword");
+  yield check_keyword(true, "http://example.com/", "keyword2");
+  yield check_keyword(true, "http://example.com/", "keyword3");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 4); // +1 keyword
+
+  // Remove one of the keywords.
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.remove("keyword");
+  yield check_keyword(false, "http://example.com/", "keyword");
+  yield check_keyword(true, "http://example.com/", "keyword2");
+  yield check_keyword(true, "http://example.com/", "keyword3");
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark.guid)),
+                                 "keyword", false, "",
+                                 bookmark.lastModified, bookmark.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark.parentGuid)),
+                                 bookmark.guid, bookmark.parentGuid ] } ]);
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 3); // -1 keyword
+
+  // Now remove the bookmark.
+  yield PlacesUtils.bookmarks.remove(bookmark);
+  while ((yield foreign_count("http://example.com/")));
+  yield check_keyword(false, "http://example.com/", "keyword");
+  yield check_keyword(false, "http://example.com/", "keyword2");
+  yield check_keyword(false, "http://example.com/", "keyword3");
+
+  check_no_orphans();
+});
+
+add_task(function* test_deleteKeywordMultipleBookmarks() {
+  let fc = yield foreign_count("http://example.com/");
+
+  let observer = expectBookmarkNotifications();
+  let bookmark1 = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                       type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                       parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  let bookmark2 = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                       type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                       parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+
+  yield check_keyword(true, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 3); // +2 bookmark +1 keyword
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark2.guid)),
+                                 "keyword", false, "keyword",
+                                 bookmark2.lastModified, bookmark2.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark2.parentGuid)),
+                                 bookmark2.guid, bookmark2.parentGuid ] },
+                  { name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark1.guid)),
+                                 "keyword", false, "keyword",
+                                 bookmark1.lastModified, bookmark1.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark1.parentGuid)),
+                                 bookmark1.guid, bookmark1.parentGuid ] } ]);
+
+  observer = expectBookmarkNotifications();
+  yield PlacesUtils.keywords.remove("keyword");
+  yield check_keyword(false, "http://example.com/", "keyword");
+  Assert.equal((yield foreign_count("http://example.com/")), fc + 2); // -1 keyword
+  observer.check([{ name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark2.guid)),
+                                 "keyword", false, "",
+                                 bookmark2.lastModified, bookmark2.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark2.parentGuid)),
+                                 bookmark2.guid, bookmark2.parentGuid ] },
+                  { name: "onItemChanged",
+                    arguments: [ (yield PlacesUtils.promiseItemId(bookmark1.guid)),
+                                 "keyword", false, "",
+                                 bookmark1.lastModified, bookmark1.type,
+                                 (yield PlacesUtils.promiseItemId(bookmark1.parentGuid)),
+                                 bookmark1.guid, bookmark1.parentGuid ] } ]);
+
+  // Now remove the bookmarks.
+  yield PlacesUtils.bookmarks.remove(bookmark1);
+  yield PlacesUtils.bookmarks.remove(bookmark2);
+  Assert.equal((yield foreign_count("http://example.com/")), fc); // -2 bookmarks
+
+  check_no_orphans();
+});
+
+add_task(function* test_multipleKeywordsSamePostData() {
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/", postData: "postData1" });
+  yield check_keyword(true, "http://example.com/", "keyword", "postData1");
+  // Add another keyword with same postData, should fail.
+  yield Assert.rejects(PlacesUtils.keywords.insert({ keyword: "keyword2", url: "http://example.com/", postData: "postData1" }),
+                       /constraint failed/);
+  yield check_keyword(false, "http://example.com/", "keyword2", "postData1");
+
+  yield PlacesUtils.keywords.remove("keyword");
+
+  check_no_orphans();
+});
+
+add_task(function* test_oldPostDataAPI() {
+  let bookmark = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                      type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                      parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com/" });
+  let itemId = yield PlacesUtils.promiseItemId(bookmark.guid);
+  yield PlacesUtils.setPostDataForBookmark(itemId, "postData");
+  yield check_keyword(true, "http://example.com/", "keyword", "postData");
+  Assert.equal(PlacesUtils.getPostDataForBookmark(itemId), "postData");
+
+  yield PlacesUtils.keywords.remove("keyword");
+  yield PlacesUtils.bookmarks.remove(bookmark);
+
+  check_no_orphans();
+});
+
+add_task(function* test_oldKeywordsAPI() {
+  let bookmark = yield PlacesUtils.bookmarks.insert({ url: "http://example.com/",
+                                                    type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+                                                    parentGuid: PlacesUtils.bookmarks.unfiledGuid });
+  yield check_keyword(false, "http://example.com/", "keyword");
+  let itemId = yield PlacesUtils.promiseItemId(bookmark.guid);
+
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "keyword");
+  yield promiseKeyword("keyword", "http://example.com/");
+
+  // Remove the keyword.
+  PlacesUtils.bookmarks.setKeywordForBookmark(itemId, "");
+  yield promiseKeyword("keyword", null);
+
+  yield PlacesUtils.keywords.insert({ keyword: "keyword", url: "http://example.com" });
+  Assert.equal(PlacesUtils.bookmarks.getKeywordForBookmark(itemId), "keyword");
+  Assert.equal(PlacesUtils.bookmarks.getURIForKeyword("keyword").spec, "http://example.com/");
+  yield PlacesUtils.bookmarks.remove(bookmark);
+
+  check_no_orphans();
+});
+
+function run_test() {
+  run_next_test();
+}
diff --git a/toolkit/components/places/tests/unit/test_placesTxn.js b/toolkit/components/places/tests/unit/test_placesTxn.js
index f8bb1aa83b7c..9c8979fe2990 100644
--- a/toolkit/components/places/tests/unit/test_placesTxn.js
+++ b/toolkit/components/places/tests/unit/test_placesTxn.js
@@ -732,8 +732,8 @@ add_test(function test_edit_postData() {
   txn.undoTransaction();
   [url, post_data] = PlacesUtils.getURLAndPostDataForKeyword("kw");
   Assert.equal(url, testURI.spec);
-  Assert.equal(null, post_data);
-
+  // We don't allow anymore to set a null post data.
+  //Assert.equal(null, post_data);
 
   run_next_test();
 });
diff --git a/toolkit/components/places/tests/unit/xpcshell.ini b/toolkit/components/places/tests/unit/xpcshell.ini
index d815f91b5efb..5aa5be74d0c8 100644
--- a/toolkit/components/places/tests/unit/xpcshell.ini
+++ b/toolkit/components/places/tests/unit/xpcshell.ini
@@ -44,7 +44,6 @@ skip-if = os == "android"
 [test_419731.js]
 [test_419792_node_tags_property.js]
 [test_420331_wyciwyg.js]
-[test_421180.js]
 [test_425563.js]
 [test_429505_remove_shortcuts.js]
 [test_433317_query_title_update.js]
@@ -104,6 +103,7 @@ skip-if = os == "android"
 [test_hosts_triggers.js]
 [test_isURIVisited.js]
 [test_isvisited.js]
+[test_keywords.js]
 [test_lastModified.js]
 [test_markpageas.js]
 [test_mozIAsyncLivemarks.js]

From bc9ba496861b4395d5632e73fac402ddbda738fa Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Fri, 20 Mar 2015 12:08:47 +0100
Subject: [PATCH 18/80] Bug 1125115 - Remove (now) pointless test that is
 failing to reopen a CLOSED TREE

---
 .../places/tests/bookmarks/test_bookmarks.js  | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/toolkit/components/places/tests/bookmarks/test_bookmarks.js b/toolkit/components/places/tests/bookmarks/test_bookmarks.js
index 8911f68a5805..96901fec9508 100644
--- a/toolkit/components/places/tests/bookmarks/test_bookmarks.js
+++ b/toolkit/components/places/tests/bookmarks/test_bookmarks.js
@@ -321,27 +321,8 @@ add_task(function test_bookmarks() {
   // test setKeywordForBookmark
   let kwTestItemId = bs.insertBookmark(testRoot, uri("http://keywordtest.com"),
                                        bs.DEFAULT_INDEX, "");
-
-  dateAdded = bs.getItemDateAdded(kwTestItemId);
-  // after just inserting, modified should not be set
-  lastModified = bs.getItemLastModified(kwTestItemId);
-  do_check_eq(lastModified, dateAdded);
-  // Workaround possible VM timers issues moving lastModified and dateAdded
-  // to the past.
-  lastModified -= 1000;
-  bs.setItemLastModified(kwTestItemId, lastModified);
-  dateAdded -= 1000;
-  bs.setItemDateAdded(kwTestItemId, dateAdded);
   bs.setKeywordForBookmark(kwTestItemId, "bar");
-  lastModified2 = bs.getItemLastModified(kwTestItemId);
-  LOG("test setKeywordForBookmark");
-  LOG("dateAdded = " + dateAdded);
-  LOG("lastModified = " + lastModified);
-  LOG("lastModified2 = " + lastModified2);
-  do_check_true(is_time_ordered(lastModified, lastModified2));
-  do_check_true(is_time_ordered(dateAdded, lastModified2));
 
-  let lastModified3 = bs.getItemLastModified(kwTestItemId);
   // test getKeywordForBookmark
   let k = bs.getKeywordForBookmark(kwTestItemId);
   do_check_eq("bar", k);

From 79075a61e1a37d993c5a1bbc6147dc4a945d263f Mon Sep 17 00:00:00 2001
From: Jorg K <mozilla@jorgk.com>
Date: Fri, 20 Mar 2015 11:18:07 +0100
Subject: [PATCH 19/80] Bug 1042561 - Autocomplete: Typed text in red despite
 results/matches found if suggestions change by last input r=mak

---
 toolkit/components/autocomplete/nsAutoCompleteController.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index 8eaa95b74b21..bdaa78625ba1 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -1505,7 +1505,7 @@ nsAutoCompleteController::ProcessResult(int32_t aSearchIndex, nsIAutoCompleteRes
     // get results in the future to avoid unnecessarily canceling searches.
     if (mRowCount || !minResults) {
       OpenPopup();
-    } else if (result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
+    } else if (mSearchesOngoing == 0) {
       ClosePopup();
     }
   }

From 6b0e509bcd09a1ad14c88c1806bb5c9f159a0cdb Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Fri, 20 Mar 2015 11:15:40 +0100
Subject: [PATCH 20/80] Bug 1042561 - Correct autocomplete search result update
 handling in OnUpdateSearchResult() r=mak

---
 .../autocomplete/nsAutoCompleteController.cpp | 66 ++++++++++++-------
 .../autocomplete/nsAutoCompleteController.h   |  2 +
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index bdaa78625ba1..7df45105b1c8 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -732,6 +732,18 @@ nsAutoCompleteController::GetSearchString(nsAString &aSearchString)
   return NS_OK;
 }
 
+void
+nsAutoCompleteController::HandleSearchResult(nsIAutoCompleteSearch *aSearch,
+                                             nsIAutoCompleteResult *aResult)
+{
+  // Look up the index of the search which is returning.
+  for (uint32_t i = 0; i < mSearches.Length(); ++i) {
+    if (mSearches[i] == aSearch) {
+      ProcessResult(i, aResult);
+    }
+  }
+}
+
 
 ////////////////////////////////////////////////////////////////////////
 //// nsIAutoCompleteObserver
@@ -739,18 +751,41 @@ nsAutoCompleteController::GetSearchString(nsAString &aSearchString)
 NS_IMETHODIMP
 nsAutoCompleteController::OnUpdateSearchResult(nsIAutoCompleteSearch *aSearch, nsIAutoCompleteResult* aResult)
 {
+  MOZ_ASSERT(mSearches.Contains(aSearch));
+
   ClearResults();
-  return OnSearchResult(aSearch, aResult);
+  HandleSearchResult(aSearch, aResult);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsAutoCompleteController::OnSearchResult(nsIAutoCompleteSearch *aSearch, nsIAutoCompleteResult* aResult)
 {
-  // look up the index of the search which is returning
-  for (uint32_t i = 0; i < mSearches.Length(); ++i) {
-    if (mSearches[i] == aSearch) {
-      ProcessResult(i, aResult);
-    }
+  MOZ_ASSERT(mSearchesOngoing > 0 && mSearches.Contains(aSearch));
+
+  // If this is the first search result we are processing
+  // we should clear out the previously cached results.
+  if (mFirstSearchResult) {
+    ClearResults();
+    mFirstSearchResult = false;
+  }
+
+  uint16_t result = 0;
+  if (aResult) {
+    aResult->GetSearchResult(&result);
+  }
+
+  // If our results are incremental, the search is still ongoing.
+  if (result != nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING &&
+      result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
+    --mSearchesOngoing;
+  }
+
+  HandleSearchResult(aSearch, aResult);
+
+  if (mSearchesOngoing == 0) {
+    // If this is the last search to return, cleanup.
+    PostSearchCleanup();
   }
 
   return NS_OK;
@@ -1107,6 +1142,7 @@ nsAutoCompleteController::StartSearch(uint16_t aSearchType)
     rv = search->StartSearch(mSearchString, searchParam, result, static_cast<nsIAutoCompleteObserver *>(this));
     if (NS_FAILED(rv)) {
       ++mSearchesFailed;
+      MOZ_ASSERT(mSearchesOngoing > 0);
       --mSearchesOngoing;
     }
     // Because of the joy of nested event loops (which can easily happen when some
@@ -1429,23 +1465,10 @@ nsAutoCompleteController::ProcessResult(int32_t aSearchIndex, nsIAutoCompleteRes
   NS_ENSURE_STATE(mInput);
   nsCOMPtr<nsIAutoCompleteInput> input(mInput);
 
-  // If this is the first search result we are processing
-  // we should clear out the previously cached results
-  if (mFirstSearchResult) {
-    ClearResults();
-    mFirstSearchResult = false;
-  }
-
   uint16_t result = 0;
   if (aResult)
     aResult->GetSearchResult(&result);
 
-  // if our results are incremental, the search is still ongoing
-  if (result != nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING &&
-      result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
-    --mSearchesOngoing;
-  }
-
   uint32_t oldMatchCount = 0;
   uint32_t matchCount = 0;
   if (aResult)
@@ -1516,11 +1539,6 @@ nsAutoCompleteController::ProcessResult(int32_t aSearchIndex, nsIAutoCompleteRes
     CompleteDefaultIndex(resultIndex);
   }
 
-  if (mSearchesOngoing == 0) {
-    // If this is the last search to return, cleanup.
-    PostSearchCleanup();
-  }
-
   return NS_OK;
 }
 
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.h b/toolkit/components/autocomplete/nsAutoCompleteController.h
index f96e55f3ab6b..6d2676a6018c 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.h
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.h
@@ -50,6 +50,8 @@ protected:
   nsresult ClearSearchTimer();
   void MaybeCompletePlaceholder();
 
+  void HandleSearchResult(nsIAutoCompleteSearch *aSearch,
+                          nsIAutoCompleteResult *aResult);
   nsresult ProcessResult(int32_t aSearchIndex, nsIAutoCompleteResult *aResult);
   nsresult PostSearchCleanup();
 

From 1d9e7740aa73fdc62334b2763fd2dce4a8e2e78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eddy=20Bru=C3=ABl?= <ejpbruel@gmail.com>
Date: Fri, 20 Mar 2015 12:11:54 +0100
Subject: [PATCH 21/80] Bug 1138975 - Refactor breakpoint sliding for
 non-source mapped sources;r=jlongster

---
 .../test/browser_dbg_source-maps-04.js        |  18 +-
 toolkit/devtools/server/actors/script.js      | 218 +++++++++++++++---
 .../server/actors/utils/ScriptStore.js        |   6 +
 3 files changed, 205 insertions(+), 37 deletions(-)

diff --git a/browser/devtools/debugger/test/browser_dbg_source-maps-04.js b/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
index cc285c493125..226a40a2de90 100644
--- a/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
@@ -89,11 +89,11 @@ function testSetBreakpoint() {
   let sourceForm = getSourceForm(gSources, JS_URL);
   let source = gDebugger.gThreadClient.source(sourceForm);
 
-  source.setBreakpoint({ line: 3, column: 61 }, aResponse => {
+  source.setBreakpoint({ line: 3, column: 60 }, aResponse => {
     ok(!aResponse.error,
       "Should be able to set a breakpoint in a js file.");
     ok(!aResponse.actualLocation,
-      "Should be able to set a breakpoint on line 3 and column 61.");
+      "Should be able to set a breakpoint on line 3 and column 60.");
 
     deferred.resolve();
   });
@@ -115,20 +115,16 @@ function testHitBreakpoint() {
     is(aResponse.type, "resumed", "Type should be 'resumed'.");
 
     waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES).then(() => {
-      is(gFrames.itemCount, 2, "Should have two frames.");
+      is(gFrames.itemCount, 1, "Should have one frame.");
 
       // This is weird, but we need to let the debugger a chance to
       // update first
       executeSoon(() => {
         gDebugger.gThreadClient.resume(() => {
-          gDebugger.gThreadClient.addOneTimeListener("paused", () => {
-            gDebugger.gThreadClient.resume(() => {
-              // We also need to make sure the next step doesn't add a
-              // "resumed" handler until this is completely finished
-              executeSoon(() => {
-                deferred.resolve();
-              });
-            });
+          // We also need to make sure the next step doesn't add a
+          // "resumed" handler until this is completely finished
+          executeSoon(() => {
+            deferred.resolve();
           });
         });
       });
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index f4b56a9ee621..842fa02518ae 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -2791,21 +2791,16 @@ SourceActor.prototype = {
    * Ensure the given BreakpointActor is set as a breakpoint handler on all
    * scripts that match its location in the original source.
    *
-   * It is possible that no scripts match the given location, because they have
-   * all been garbage collected. In that case, the BreakpointActor is not set as
-   * a breakpoint handler for any script, but is still inserted in the
-   * BreakpointActorMap as a pending breakpoint. Whenever a new script is
-   * introduced, we call this method again to see if there are now any scripts
-   * that matches the given location.
+   * If there are no scripts that match the location of the BreakpointActor,
+   * we slide its location to the next closest line (for line breakpoints) or
+   * column (for column breakpoint) that does.
    *
-   * The first time we find one or more scripts that matches the given location,
-   * we check if any of these scripts has any entry points for the given
-   * location. If not, we assume that the given location does not have any code.
-   *
-   * If the given location does not contain any code, we slide the breakpoint
-   * down to the next closest line that does, and update the BreakpointActorMap
-   * accordingly. Note that we only do so if the BreakpointActor is still
-   * pending (i.e. is not set as a breakpoint handler for any script).
+   * If breakpoint sliding fails, then either there are no scripts that contain
+   * any code for the given location, or they were all garbage collected before
+   * the debugger started running. We cannot distinguish between these two
+   * cases, so we insert the BreakpointActor in the BreakpointActorMap as
+   * a pending breakpoint. Whenever a new script is introduced, this method is
+   * called again for each pending breakpoint.
    *
    * @param BreakpointActor actor
    *        The BreakpointActor to be set as a breakpoint handler.
@@ -2813,21 +2808,125 @@ SourceActor.prototype = {
    * @returns A Promise that resolves to the given BreakpointActor.
    */
   _setBreakpointForActor: function (actor) {
+    let { originalLocation } = actor;
+
     if (this.isSourceMapped) {
-      return this.threadActor.sources.getGeneratedLocation(
-        actor.originalLocation
-      ).then((generatedLocation) => {
+      // TODO: Refactor breakpoint sliding for source mapped sources.
+      return this.threadActor.sources.getGeneratedLocation(originalLocation)
+                                     .then((generatedLocation) => {
         return generatedLocation.generatedSourceActor
-                                ._setBreakpointForActorAtLocation(
+                                ._setBreakpointForActorAtLocationWithSliding(
           actor,
           generatedLocation
         );
       });
     } else {
-      return Promise.resolve(this._setBreakpointForActorAtLocation(
-        actor,
-        GeneratedLocation.fromOriginalLocation(actor.originalLocation)
-      ));
+      // If this is a non-source mapped source, the original location and
+      // generated location are the same, so we can safely convert between them.
+      let generatedLocation = GeneratedLocation.fromOriginalLocation(originalLocation);
+      let { generatedColumn } = generatedLocation;
+
+      // Try to set the breakpoint on the generated location directly. If this
+      // succeeds, we can avoid the more expensive breakpoint sliding algorithm
+      // below.
+      if (this._setBreakpointForActorAtLocation(actor, generatedLocation)) {
+        return Promise.resolve(actor);
+      }
+
+      // There were no scripts that matched the given location, so we need to
+      // perform breakpoint sliding.
+      if (generatedColumn === undefined) {
+        // To perform breakpoint sliding for line breakpoints, we need to build
+        // a map from line numbers to a list of entry points for each line,
+        // implemented as a sparse array. An entry point is a (script, offsets)
+        // pair, and represents all offsets in that script that are entry points
+        // for the corresponding line.
+        let lineToEntryPointsMap = [];
+
+        // Iterate over all scripts that correspond to this source actor.
+        let scripts = this.scripts.getScriptsBySourceActor(this);
+        for (let script of scripts) {
+          // Get all offsets for each line in the current script. This returns
+          // a map from line numbers fo a list of offsets for each line,
+          // implemented as a sparse array.
+          let lineToOffsetsMap = script.getAllOffsets();
+
+          // Iterate over each line, and add their list of offsets to the map
+          // from line numbers to entry points by forming a (script, offsets)
+          // pair, where script is the current script, and offsets is the list
+          // of offsets for the current line.
+          for (let line = 0; line < lineToOffsetsMap.length; ++line) {
+            let offsets = lineToOffsetsMap[line];
+            if (offsets) {
+              let entryPoints = lineToEntryPointsMap[line];
+              if (!entryPoints) {
+                // We dont have a list of entry points for the current line
+                // number yet, so create it and add it to the map.
+                entryPoints = [];
+                lineToEntryPointsMap[line] = entryPoints;
+              }
+              entryPoints.push({ script, offsets });
+            }
+          }
+        }
+
+        let {
+          originalSourceActor,
+          originalLine,
+          originalColumn
+        } = originalLocation;
+
+        // Now that we have a map from line numbers to a list of entry points
+        // for each line, we can use it to perform breakpoint sliding. Start
+        // at the original line of the breakpoint actor, and keep incrementing
+        // it by one, until either we find a line that has at least one entry
+        // point, or we go past the last line in the map.
+        //
+        // Note that by computing the entire map up front, and implementing it
+        // as a sparse array, we can easily tell when we went past the last line
+        // in the map.
+        let actualLine = originalLine;
+        while (actualLine < lineToEntryPointsMap.length) {
+          let entryPoints = lineToEntryPointsMap[actualLine];
+          if (entryPoints) {
+            setBreakpointForActorAtEntryPoints(actor, entryPoints);
+            break;
+          }
+          ++actualLine;
+        }
+        if (actualLine === lineToEntryPointsMap.length) {
+          // We went past the last line in the map, so breakpoint sliding
+          // failed. Keep the BreakpointActor in the BreakpointActorMap as a
+          // pending breakpoint, so we can try again whenever a new script is
+          // introduced.
+          return Promise.resolve(actor);
+        }
+
+        // If the actual line on which the BreakpointActor was set differs from
+        // the original line that was requested, the BreakpointActor and the
+        // BreakpointActorMap need to be updated accordingly.
+        if (actualLine !== originalLine) {
+          let actualLocation = new OriginalLocation(
+            originalSourceActor,
+            actualLine
+          );
+          let existingActor = this.breakpointActorMap.getActor(actualLocation);
+          if (existingActor) {
+            actor.onDelete();
+            this.breakpointActorMap.deleteActor(originalLocation);
+            actor = existingActor;
+          } else {
+            this.breakpointActorMap.deleteActor(originalLocation);
+            actor.originalLocation = actualLocation;
+            this.breakpointActorMap.setActor(actualLocation, actor);
+          }
+        }
+
+        return Promise.resolve(actor);
+      } else {
+        // TODO: Implement breakpoint sliding for column breakpoints
+        return Promise.resolve(actor);
+      }
     }
   },
 
@@ -2841,8 +2940,79 @@ SourceActor.prototype = {
    *        A GeneratedLocation representing the location in the generated
    *        source for which the given BreakpointActor is to be set as a
    *        breakpoint handler.
+   *
+   * @returns A Boolean that is true if the BreakpointActor was set as a
+   *          breakpoint handler on at least one script, and false otherwise.
    */
   _setBreakpointForActorAtLocation: function (actor, generatedLocation) {
+    let { generatedLine, generatedColumn } = generatedLocation;
+
+    // Find all scripts that match the given source actor and line number.
+    let scripts = this.scripts.getScriptsBySourceActorAndLine(
+      this,
+      generatedLine
+    ).filter((script) => !actor.hasScript(script));
+
+    // Find all entry points that correspond to the given location.
+    let entryPoints = [];
+    if (generatedColumn === undefined) {
+      // This is a line breakpoint, so we are interested in all offsets
+      // that correspond to the given line number.
+      for (let script of scripts) {
+        let offsets = script.getLineOffsets(generatedLine);
+        if (offsets.length > 0) {
+          entryPoints.push({ script, offsets });
+        }
+      }
+    } else {
+      // This is a column breakpoint, so we are interested in all column
+      // offsets that correspond to the given line *and* column number.
+      for (let script of scripts) {
+        let columnToOffsetMap = script.getAllColumnOffsets()
+                                      .filter(({ lineNumber }) => {
+          return lineNumber === generatedLine;
+        });
+        for (let { columnNumber: column, offset } of columnToOffsetMap) {
+          // TODO: What we are actually interested in here is a range of
+          // columns, rather than a single one.
+          if (column == generatedColumn) {
+            entryPoints.push({ script, offsets: [offset] });
+          }
+        }
+      }
+    }
+
+    if (entryPoints.length === 0) {
+      return false;
+    }
+    setBreakpointForActorAtEntryPoints(actor, entryPoints);
+    return true;
+  },
+
+  /*
+   * Ensure the given BreakpointActor is set as breakpoint handler on all
+   * scripts that match the given location in the generated source.
+   *
+   * TODO: This method is bugged, because it performs breakpoint sliding on
+   * generated locations. Breakpoint sliding should be performed on original
+   * locations, because there is no guarantee that the next line in the
+   * generated source corresponds to the next line in an original source.
+   *
+   * The only place this method is still used is from setBreakpointForActor
+   * when called for a source mapped source. Once that code has been refactored,
+   * this method can be removed.
+   *
+   * @param BreakpointActor actor
+   *        The BreakpointActor to be set as a breakpoint handler.
+   * @param GeneratedLocation generatedLocation
+   *        A GeneratedLocation representing the location in the generated
+   *        source for which the given BreakpointActor is to be set as a
+   *        breakpoint handler.
+   *
+   * @returns A Boolean that is true if the BreakpointActor was set as a
+   *          breakpoint handler on at least one script, and false otherwise.
+   */
+  _setBreakpointForActorAtLocationWithSliding: function (actor, generatedLocation) {
     let originalLocation = actor.originalLocation;
     let { generatedLine, generatedColumn } = generatedLocation;
 
@@ -2967,10 +3137,6 @@ SourceActor.prototype = {
       }
       actor.addScript(script, this.threadActor);
     }
-
-    return {
-      actor: actor.actorID
-    };
   },
 
   /**
diff --git a/toolkit/devtools/server/actors/utils/ScriptStore.js b/toolkit/devtools/server/actors/utils/ScriptStore.js
index 9d9a557057e6..a1e5d8a1e70d 100644
--- a/toolkit/devtools/server/actors/utils/ScriptStore.js
+++ b/toolkit/devtools/server/actors/utils/ScriptStore.js
@@ -79,6 +79,12 @@ ScriptStore.prototype = {
     return this._scripts.items;
   },
 
+  getScriptsBySourceActor(sourceActor) {
+    return sourceActor.source ?
+           this.getScriptsBySource(sourceActor.source) :
+           this.getScriptsByURL(sourceActor._originalUrl);
+  },
+
   getScriptsBySourceActorAndLine(sourceActor, line) {
     return sourceActor.source ?
            this.getScriptsBySourceAndLine(sourceActor.source, line) :

From c150e8dbed50f3efcd05d18d76f4d86d0120a163 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 20 Mar 2015 13:32:01 +0100
Subject: [PATCH 22/80] Backed out changeset ef86c7c53d21 (bug 1042561)

---
 .../autocomplete/nsAutoCompleteController.cpp | 66 +++++++------------
 .../autocomplete/nsAutoCompleteController.h   |  2 -
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index 7df45105b1c8..bdaa78625ba1 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -732,18 +732,6 @@ nsAutoCompleteController::GetSearchString(nsAString &aSearchString)
   return NS_OK;
 }
 
-void
-nsAutoCompleteController::HandleSearchResult(nsIAutoCompleteSearch *aSearch,
-                                             nsIAutoCompleteResult *aResult)
-{
-  // Look up the index of the search which is returning.
-  for (uint32_t i = 0; i < mSearches.Length(); ++i) {
-    if (mSearches[i] == aSearch) {
-      ProcessResult(i, aResult);
-    }
-  }
-}
-
 
 ////////////////////////////////////////////////////////////////////////
 //// nsIAutoCompleteObserver
@@ -751,41 +739,18 @@ nsAutoCompleteController::HandleSearchResult(nsIAutoCompleteSearch *aSearch,
 NS_IMETHODIMP
 nsAutoCompleteController::OnUpdateSearchResult(nsIAutoCompleteSearch *aSearch, nsIAutoCompleteResult* aResult)
 {
-  MOZ_ASSERT(mSearches.Contains(aSearch));
-
   ClearResults();
-  HandleSearchResult(aSearch, aResult);
-  return NS_OK;
+  return OnSearchResult(aSearch, aResult);
 }
 
 NS_IMETHODIMP
 nsAutoCompleteController::OnSearchResult(nsIAutoCompleteSearch *aSearch, nsIAutoCompleteResult* aResult)
 {
-  MOZ_ASSERT(mSearchesOngoing > 0 && mSearches.Contains(aSearch));
-
-  // If this is the first search result we are processing
-  // we should clear out the previously cached results.
-  if (mFirstSearchResult) {
-    ClearResults();
-    mFirstSearchResult = false;
-  }
-
-  uint16_t result = 0;
-  if (aResult) {
-    aResult->GetSearchResult(&result);
-  }
-
-  // If our results are incremental, the search is still ongoing.
-  if (result != nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING &&
-      result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
-    --mSearchesOngoing;
-  }
-
-  HandleSearchResult(aSearch, aResult);
-
-  if (mSearchesOngoing == 0) {
-    // If this is the last search to return, cleanup.
-    PostSearchCleanup();
+  // look up the index of the search which is returning
+  for (uint32_t i = 0; i < mSearches.Length(); ++i) {
+    if (mSearches[i] == aSearch) {
+      ProcessResult(i, aResult);
+    }
   }
 
   return NS_OK;
@@ -1142,7 +1107,6 @@ nsAutoCompleteController::StartSearch(uint16_t aSearchType)
     rv = search->StartSearch(mSearchString, searchParam, result, static_cast<nsIAutoCompleteObserver *>(this));
     if (NS_FAILED(rv)) {
       ++mSearchesFailed;
-      MOZ_ASSERT(mSearchesOngoing > 0);
       --mSearchesOngoing;
     }
     // Because of the joy of nested event loops (which can easily happen when some
@@ -1465,10 +1429,23 @@ nsAutoCompleteController::ProcessResult(int32_t aSearchIndex, nsIAutoCompleteRes
   NS_ENSURE_STATE(mInput);
   nsCOMPtr<nsIAutoCompleteInput> input(mInput);
 
+  // If this is the first search result we are processing
+  // we should clear out the previously cached results
+  if (mFirstSearchResult) {
+    ClearResults();
+    mFirstSearchResult = false;
+  }
+
   uint16_t result = 0;
   if (aResult)
     aResult->GetSearchResult(&result);
 
+  // if our results are incremental, the search is still ongoing
+  if (result != nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING &&
+      result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
+    --mSearchesOngoing;
+  }
+
   uint32_t oldMatchCount = 0;
   uint32_t matchCount = 0;
   if (aResult)
@@ -1539,6 +1516,11 @@ nsAutoCompleteController::ProcessResult(int32_t aSearchIndex, nsIAutoCompleteRes
     CompleteDefaultIndex(resultIndex);
   }
 
+  if (mSearchesOngoing == 0) {
+    // If this is the last search to return, cleanup.
+    PostSearchCleanup();
+  }
+
   return NS_OK;
 }
 
diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.h b/toolkit/components/autocomplete/nsAutoCompleteController.h
index 6d2676a6018c..f96e55f3ab6b 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.h
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.h
@@ -50,8 +50,6 @@ protected:
   nsresult ClearSearchTimer();
   void MaybeCompletePlaceholder();
 
-  void HandleSearchResult(nsIAutoCompleteSearch *aSearch,
-                          nsIAutoCompleteResult *aResult);
   nsresult ProcessResult(int32_t aSearchIndex, nsIAutoCompleteResult *aResult);
   nsresult PostSearchCleanup();
 

From cb5b2490cb6822a428c46a30f43fe4591de35765 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 20 Mar 2015 13:32:28 +0100
Subject: [PATCH 23/80] backed out changeset b798fd098e09 (bug 1042561) for
 assertion failure in mochitests

---
 toolkit/components/autocomplete/nsAutoCompleteController.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index bdaa78625ba1..8eaa95b74b21 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -1505,7 +1505,7 @@ nsAutoCompleteController::ProcessResult(int32_t aSearchIndex, nsIAutoCompleteRes
     // get results in the future to avoid unnecessarily canceling searches.
     if (mRowCount || !minResults) {
       OpenPopup();
-    } else if (mSearchesOngoing == 0) {
+    } else if (result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
       ClosePopup();
     }
   }

From 2ba8b0c44c91fca9b124a2848add6c1327fcdd09 Mon Sep 17 00:00:00 2001
From: Alex Verstak <averstak@google.com>
Date: Fri, 20 Mar 2015 02:07:00 -0700
Subject: [PATCH 24/80] Bug 1144816 - focus the content window before popping
 up the context menu, rs=gijs

---
 browser/base/content/test/referrer/head.js | 49 +++++++++++++++-------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/browser/base/content/test/referrer/head.js b/browser/base/content/test/referrer/head.js
index 30885391b8c2..b1c86e6ed156 100644
--- a/browser/base/content/test/referrer/head.js
+++ b/browser/base/content/test/referrer/head.js
@@ -99,26 +99,45 @@ function clickTheLink(aWindow, aLinkId, aOptions) {
                     function(data) {
     let element = content.document.getElementById(data.id);
     let options = data.options;
-    element.focus();
 
     // EventUtils.synthesizeMouseAtCenter(element, options, content);
     // Alas, EventUtils doesn't work in the content task environment.
-    var domWindowUtils =
-        content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-        .getInterface(Components.interfaces.nsIDOMWindowUtils);
-    var rect = element.getBoundingClientRect();
-    var left = rect.left + rect.width / 2;
-    var top = rect.top + rect.height / 2;
-    var button = options.button || 0;
-    function sendMouseEvent(type) {
-      domWindowUtils.sendMouseEvent(type, left, top, button,
-                                    1, 0, false, 0, 0, true);
+    function doClick() {
+      var domWindowUtils =
+          content.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+          .getInterface(Components.interfaces.nsIDOMWindowUtils);
+      var rect = element.getBoundingClientRect();
+      var left = rect.left + rect.width / 2;
+      var top = rect.top + rect.height / 2;
+      var button = options.button || 0;
+      function sendMouseEvent(type) {
+        domWindowUtils.sendMouseEvent(type, left, top, button,
+                                      1, 0, false, 0, 0, true);
+      }
+      if ("type" in options) {
+        sendMouseEvent(options.type);  // e.g., "contextmenu"
+      } else {
+        sendMouseEvent("mousedown");
+        sendMouseEvent("mouseup");
+      }
     }
-    if ("type" in options) {
-      sendMouseEvent(options.type);  // e.g., "contextmenu"
+
+    // waitForFocus(doClick, content);
+    let focusManager = Components.classes["@mozilla.org/focus-manager;1"].
+                       getService(Components.interfaces.nsIFocusManager);
+    let desiredWindow = {};
+    focusManager.getFocusedElementForWindow(content, true, desiredWindow);
+    desiredWindow = desiredWindow.value;
+    if (desiredWindow == focusManager.focusedWindow) {
+      // The window is already focused - click away.
+      doClick();
     } else {
-      sendMouseEvent("mousedown");
-      sendMouseEvent("mouseup");
+      // Focus the window first, then click.
+      desiredWindow.addEventListener("focus", function onFocus() {
+        desiredWindow.removeEventListener("focus", onFocus, true);
+        setTimeout(doClick, 0);
+      }, true);
+      desiredWindow.focus();
     }
   });
 }

From dc4ca20d503f6a74e01220a9de6ed168bbb9641f Mon Sep 17 00:00:00 2001
From: Martyn Haigh <martyn.haigh@gmail.com>
Date: Fri, 20 Mar 2015 13:42:09 +0000
Subject: [PATCH 25/80] Bug 1129433 - Show &quot;# tabs opened in
 background&quot; notification in system tray (r=mcomella)

---
 .../base/locales/en-US/android_strings.dtd    | 14 +++++
 mobile/android/base/resources/values/ids.xml  |  1 +
 mobile/android/base/strings.xml.in            |  4 ++
 .../android/base/tabqueue/TabQueueHelper.java | 58 ++++++++++++++++---
 .../base/tabqueue/TabQueueService.java        |  7 ++-
 5 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index b0c870fcbcfb..b804ac187027 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -186,6 +186,20 @@
 
 <!ENTITY tab_queue_toast_message "Open later">
 <!ENTITY tab_queue_toast_action "Open now">
+<!-- Localization note (tab_queue_notification_text_plural) : The
+     formatD is replaced with the number of tabs queued.  The
+     number of tabs queued is always more than one.  We can't use
+     Android plural forms, sadly. See Bug #753859. -->
+<!ENTITY tab_queue_notification_text_plural "&formatD; tabs queued">
+<!-- Localization note (tab_queue_notification_title_plural) : This is the
+     title of a notification; we expect more than one tab queued. -->
+<!ENTITY tab_queue_notification_title_plural "Tabs Queued">
+<!-- Localization note (tab_queue_notification_title_singular) : This is the
+     title of a notification; we expect only one tab queued. -->
+<!ENTITY tab_queue_notification_title_singular "Tab Queued">
+<!-- Localization note (tab_queue_notification_text_singular) : This is the
+     text of a notification; we expect only one tab queued. -->
+<!ENTITY tab_queue_notification_text_singular "1 tab queued">
 
 <!ENTITY pref_char_encoding "Character encoding">
 <!ENTITY pref_char_encoding_on "Show menu">
diff --git a/mobile/android/base/resources/values/ids.xml b/mobile/android/base/resources/values/ids.xml
index 5dfad221447e..de79130c2d30 100644
--- a/mobile/android/base/resources/values/ids.xml
+++ b/mobile/android/base/resources/values/ids.xml
@@ -5,6 +5,7 @@
 
 <resources>
 
+    <item type="id" name="tabQueueNotification"/>
     <item type="id" name="guestNotification"/>
     <item type="id" name="original_height"/>
     <item type="id" name="menu_items"/>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 74722e51f360..c31bec472e5c 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -241,6 +241,10 @@
 
   <string name="tab_queue_toast_message">&tab_queue_toast_message;</string>
   <string name="tab_queue_toast_action">&tab_queue_toast_action;</string>
+  <string name="tab_queue_notification_text_singular">&tab_queue_notification_text_singular;</string>
+  <string name="tab_queue_notification_text_plural">&tab_queue_notification_text_plural;</string>
+  <string name="tab_queue_notification_title_singular">&tab_queue_notification_title_singular;</string>
+  <string name="tab_queue_notification_title_plural">&tab_queue_notification_title_plural;</string>
 
   <string name="pref_about_firefox">&pref_about_firefox;</string>
   <string name="pref_vendor_faqs">&pref_vendor_faqs;</string>
diff --git a/mobile/android/base/tabqueue/TabQueueHelper.java b/mobile/android/base/tabqueue/TabQueueHelper.java
index ffa80cd3dcd7..aa9babbd9284 100644
--- a/mobile/android/base/tabqueue/TabQueueHelper.java
+++ b/mobile/android/base/tabqueue/TabQueueHelper.java
@@ -5,20 +5,24 @@
 
 package org.mozilla.gecko.tabqueue;
 
-import org.mozilla.gecko.GeckoProfile;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.text.TextUtils;
-import android.util.Log;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.support.v4.app.NotificationCompat;
 import org.json.JSONArray;
-import org.json.JSONException;
-
-import java.io.IOException;
+import org.mozilla.gecko.BrowserApp;
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.util.ThreadUtils;
 
 public class TabQueueHelper {
     private static final String LOGTAG = "Gecko" + TabQueueHelper.class.getSimpleName();
 
     public static final String FILE_NAME = "tab_queue_url_list.json";
+    public static final String LOAD_URLS_ACTION = "TAB_QUEUE_LOAD_URLS_ACTION";
+    public static final int TAB_QUEUE_NOTIFICATION_ID = R.id.tabQueueNotification;
 
     /**
      * Reads file and converts any content to JSON, adds passed in URL to the data and writes back to the file,
@@ -27,8 +31,9 @@ public class TabQueueHelper {
      * @param profile
      * @param url      URL to add
      * @param filename filename to add URL to
+     * @return the number of tabs currently queued
      */
-    public static void queueURL(final GeckoProfile profile, final String url, final String filename) {
+    public static int queueURL(final GeckoProfile profile, final String url, final String filename) {
         ThreadUtils.assertNotOnUiThread();
 
         JSONArray jsonArray = profile.readJSONArrayFromFile(filename);
@@ -36,5 +41,40 @@ public class TabQueueHelper {
         jsonArray.put(url);
 
         profile.writeFile(filename, jsonArray.toString());
+
+        return jsonArray.length();
+    }
+
+    /**
+     * Displays a notification showing the total number of tabs queue.  If there is already a notification displayed, it
+     * will be replaced.
+     *
+     * @param context
+     * @param tabsQueued
+     */
+    static public void showNotification(Context context, int tabsQueued) {
+        Intent resultIntent = new Intent(context, BrowserApp.class);
+        resultIntent.setAction(TabQueueHelper.LOAD_URLS_ACTION);
+
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+
+        String title, text;
+        final Resources resources = context.getResources();
+        if(tabsQueued == 1) {
+            title = resources.getString(R.string.tab_queue_notification_title_singular);
+            text = resources.getString(R.string.tab_queue_notification_text_singular);
+        } else {
+            title = resources.getString(R.string.tab_queue_notification_title_plural);
+            text = resources.getString(R.string.tab_queue_notification_text_plural, tabsQueued);
+        }
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
+                                                                   .setSmallIcon(R.drawable.ic_status_logo)
+                                                                   .setContentTitle(title)
+                                                                   .setContentText(text)
+                                                                   .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(TabQueueHelper.TAB_QUEUE_NOTIFICATION_ID, builder.build());
     }
 }
\ No newline at end of file
diff --git a/mobile/android/base/tabqueue/TabQueueService.java b/mobile/android/base/tabqueue/TabQueueService.java
index 4a98817def9c..691918716730 100644
--- a/mobile/android/base/tabqueue/TabQueueService.java
+++ b/mobile/android/base/tabqueue/TabQueueService.java
@@ -6,6 +6,7 @@
 package org.mozilla.gecko.tabqueue;
 
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.PixelFormat;
@@ -160,8 +161,10 @@ public class TabQueueService extends Service {
         executorService.submit(new Runnable() {
             @Override
             public void run() {
-                final GeckoProfile profile = GeckoProfile.get(getApplicationContext());
-                TabQueueHelper.queueURL(profile, intentData, filename);
+                Context applicationContext = getApplicationContext();
+                final GeckoProfile profile = GeckoProfile.get(applicationContext);
+                int tabsQueued = TabQueueHelper.queueURL(profile, intentData, filename);
+                TabQueueHelper.showNotification(applicationContext, tabsQueued);
             }
         });
     }

From 9bacd9217eaf42dd5a1841255c563a5866a06ebb Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 20 Mar 2015 15:23:45 +0100
Subject: [PATCH 26/80] Backed out changeset de24b63c6966 (bug 1138975) for
 m-dt test failures

---
 .../test/browser_dbg_source-maps-04.js        |  18 +-
 toolkit/devtools/server/actors/script.js      | 218 +++---------------
 .../server/actors/utils/ScriptStore.js        |   6 -
 3 files changed, 37 insertions(+), 205 deletions(-)

diff --git a/browser/devtools/debugger/test/browser_dbg_source-maps-04.js b/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
index 226a40a2de90..cc285c493125 100644
--- a/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
@@ -89,11 +89,11 @@ function testSetBreakpoint() {
   let sourceForm = getSourceForm(gSources, JS_URL);
   let source = gDebugger.gThreadClient.source(sourceForm);
 
-  source.setBreakpoint({ line: 3, column: 60 }, aResponse => {
+  source.setBreakpoint({ line: 3, column: 61 }, aResponse => {
     ok(!aResponse.error,
       "Should be able to set a breakpoint in a js file.");
     ok(!aResponse.actualLocation,
-      "Should be able to set a breakpoint on line 3 and column 60.");
+      "Should be able to set a breakpoint on line 3 and column 61.");
 
     deferred.resolve();
   });
@@ -115,16 +115,20 @@ function testHitBreakpoint() {
     is(aResponse.type, "resumed", "Type should be 'resumed'.");
 
     waitForDebuggerEvents(gPanel, gDebugger.EVENTS.FETCHED_SCOPES).then(() => {
-      is(gFrames.itemCount, 1, "Should have one frame.");
+      is(gFrames.itemCount, 2, "Should have two frames.");
 
       // This is weird, but we need to let the debugger a chance to
       // update first
       executeSoon(() => {
         gDebugger.gThreadClient.resume(() => {
-          // We also need to make sure the next step doesn't add a
-          // "resumed" handler until this is completely finished
-          executeSoon(() => {
-            deferred.resolve();
+          gDebugger.gThreadClient.addOneTimeListener("paused", () => {
+            gDebugger.gThreadClient.resume(() => {
+              // We also need to make sure the next step doesn't add a
+              // "resumed" handler until this is completely finished
+              executeSoon(() => {
+                deferred.resolve();
+              });
+            });
           });
         });
       });
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index 842fa02518ae..f4b56a9ee621 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -2791,16 +2791,21 @@ SourceActor.prototype = {
    * Ensure the given BreakpointActor is set as a breakpoint handler on all
    * scripts that match its location in the original source.
    *
-   * If there are no scripts that match the location of the BreakpointActor,
-   * we slide its location to the next closest line (for line breakpoints) or
-   * column (for column breakpoint) that does.
+   * It is possible that no scripts match the given location, because they have
+   * all been garbage collected. In that case, the BreakpointActor is not set as
+   * a breakpoint handler for any script, but is still inserted in the
+   * BreakpointActorMap as a pending breakpoint. Whenever a new script is
+   * introduced, we call this method again to see if there are now any scripts
+   * that matches the given location.
    *
-   * If breakpoint sliding fails, then either there are no scripts that contain
-   * any code for the given location, or they were all garbage collected before
-   * the debugger started running. We cannot distinguish between these two
-   * cases, so we insert the BreakpointActor in the BreakpointActorMap as
-   * a pending breakpoint. Whenever a new script is introduced, this method is
-   * called again for each pending breakpoint.
+   * The first time we find one or more scripts that matches the given location,
+   * we check if any of these scripts has any entry points for the given
+   * location. If not, we assume that the given location does not have any code.
+   *
+   * If the given location does not contain any code, we slide the breakpoint
+   * down to the next closest line that does, and update the BreakpointActorMap
+   * accordingly. Note that we only do so if the BreakpointActor is still
+   * pending (i.e. is not set as a breakpoint handler for any script).
    *
    * @param BreakpointActor actor
    *        The BreakpointActor to be set as a breakpoint handler.
@@ -2808,125 +2813,21 @@ SourceActor.prototype = {
    * @returns A Promise that resolves to the given BreakpointActor.
    */
   _setBreakpointForActor: function (actor) {
-    let { originalLocation } = actor;
-
     if (this.isSourceMapped) {
-      // TODO: Refactor breakpoint sliding for source mapped sources.
-      return this.threadActor.sources.getGeneratedLocation(originalLocation)
-                                     .then((generatedLocation) => {
+      return this.threadActor.sources.getGeneratedLocation(
+        actor.originalLocation
+      ).then((generatedLocation) => {
         return generatedLocation.generatedSourceActor
-                                ._setBreakpointForActorAtLocationWithSliding(
+                                ._setBreakpointForActorAtLocation(
           actor,
           generatedLocation
         );
       });
     } else {
-      // If this is a non-source mapped source, the original location and
-      // generated location are the same, so we can safely convert between them.
-      let generatedLocation = GeneratedLocation.fromOriginalLocation(originalLocation);
-      let { generatedColumn } = generatedLocation;
-
-      // Try to set the breakpoint on the generated location directly. If this
-      // succeeds, we can avoid the more expensive breakpoint sliding algorithm
-      // below.
-      if (this._setBreakpointForActorAtLocation(actor, generatedLocation)) {
-        return Promise.resolve(actor);
-      }
-
-      // There were no scripts that matched the given location, so we need to
-      // perform breakpoint sliding.
-      if (generatedColumn === undefined) {
-        // To perform breakpoint sliding for line breakpoints, we need to build
-        // a map from line numbers to a list of entry points for each line,
-        // implemented as a sparse array. An entry point is a (script, offsets)
-        // pair, and represents all offsets in that script that are entry points
-        // for the corresponding line.
-        let lineToEntryPointsMap = [];
-
-        // Iterate over all scripts that correspond to this source actor.
-        let scripts = this.scripts.getScriptsBySourceActor(this);
-        for (let script of scripts) {
-          // Get all offsets for each line in the current script. This returns
-          // a map from line numbers fo a list of offsets for each line,
-          // implemented as a sparse array.
-          let lineToOffsetsMap = script.getAllOffsets();
-
-          // Iterate over each line, and add their list of offsets to the map
-          // from line numbers to entry points by forming a (script, offsets)
-          // pair, where script is the current script, and offsets is the list
-          // of offsets for the current line.
-          for (let line = 0; line < lineToOffsetsMap.length; ++line) {
-            let offsets = lineToOffsetsMap[line];
-            if (offsets) {
-              let entryPoints = lineToEntryPointsMap[line];
-              if (!entryPoints) {
-                // We dont have a list of entry points for the current line
-                // number yet, so create it and add it to the map.
-                entryPoints = [];
-                lineToEntryPointsMap[line] = entryPoints;
-              }
-              entryPoints.push({ script, offsets });
-            }
-          }
-        }
-
-        let {
-          originalSourceActor,
-          originalLine,
-          originalColumn
-        } = originalLocation;
-
-        // Now that we have a map from line numbers to a list of entry points
-        // for each line, we can use it to perform breakpoint sliding. Start
-        // at the original line of the breakpoint actor, and keep incrementing
-        // it by one, until either we find a line that has at least one entry
-        // point, or we go past the last line in the map.
-        //
-        // Note that by computing the entire map up front, and implementing it
-        // as a sparse array, we can easily tell when we went past the last line
-        // in the map.
-        let actualLine = originalLine;
-        while (actualLine < lineToEntryPointsMap.length) {
-          let entryPoints = lineToEntryPointsMap[actualLine];
-          if (entryPoints) {
-            setBreakpointForActorAtEntryPoints(actor, entryPoints);
-            break;
-          }
-          ++actualLine;
-        }
-        if (actualLine === lineToEntryPointsMap.length) {
-          // We went past the last line in the map, so breakpoint sliding
-          // failed. Keep the BreakpointActor in the BreakpointActorMap as a
-          // pending breakpoint, so we can try again whenever a new script is
-          // introduced.
-          return Promise.resolve(actor);
-        }
-
-        // If the actual line on which the BreakpointActor was set differs from
-        // the original line that was requested, the BreakpointActor and the
-        // BreakpointActorMap need to be updated accordingly.
-        if (actualLine !== originalLine) {
-          let actualLocation = new OriginalLocation(
-            originalSourceActor,
-            actualLine
-          );
-          let existingActor = this.breakpointActorMap.getActor(actualLocation);
-          if (existingActor) {
-            actor.onDelete();
-            this.breakpointActorMap.deleteActor(originalLocation);
-            actor = existingActor;
-          } else {
-            this.breakpointActorMap.deleteActor(originalLocation);
-            actor.originalLocation = actualLocation;
-            this.breakpointActorMap.setActor(actualLocation, actor);
-          }
-        }
-
-        return Promise.resolve(actor);
-      } else {
-        // TODO: Implement breakpoint sliding for column breakpoints
-        return Promise.resolve(actor);
-      }
+      return Promise.resolve(this._setBreakpointForActorAtLocation(
+        actor,
+        GeneratedLocation.fromOriginalLocation(actor.originalLocation)
+      ));
     }
   },
 
@@ -2940,79 +2841,8 @@ SourceActor.prototype = {
    *        A GeneratedLocation representing the location in the generated
    *        source for which the given BreakpointActor is to be set as a
    *        breakpoint handler.
-   *
-   * @returns A Boolean that is true if the BreakpointActor was set as a
-   *          breakpoint handler on at least one script, and false otherwise.
    */
   _setBreakpointForActorAtLocation: function (actor, generatedLocation) {
-    let { generatedLine, generatedColumn } = generatedLocation;
-
-    // Find all scripts that match the given source actor and line number.
-    let scripts = this.scripts.getScriptsBySourceActorAndLine(
-      this,
-      generatedLine
-    ).filter((script) => !actor.hasScript(script));
-
-    // Find all entry points that correspond to the given location.
-    let entryPoints = [];
-    if (generatedColumn === undefined) {
-      // This is a line breakpoint, so we are interested in all offsets
-      // that correspond to the given line number.
-      for (let script of scripts) {
-        let offsets = script.getLineOffsets(generatedLine);
-        if (offsets.length > 0) {
-          entryPoints.push({ script, offsets });
-        }
-      }
-    } else {
-      // This is a column breakpoint, so we are interested in all column
-      // offsets that correspond to the given line *and* column number.
-      for (let script of scripts) {
-        let columnToOffsetMap = script.getAllColumnOffsets()
-                                      .filter(({ lineNumber }) => {
-          return lineNumber === generatedLine;
-        });
-        for (let { columnNumber: column, offset } of columnToOffsetMap) {
-          // TODO: What we are actually interested in here is a range of
-          // columns, rather than a single one.
-          if (column == generatedColumn) {
-            entryPoints.push({ script, offsets: [offset] });
-          }
-        }
-      }
-    }
-
-    if (entryPoints.length === 0) {
-      return false;
-    }
-    setBreakpointForActorAtEntryPoints(actor, entryPoints);
-    return true;
-  },
-
-  /*
-   * Ensure the given BreakpointActor is set as breakpoint handler on all
-   * scripts that match the given location in the generated source.
-   *
-   * TODO: This method is bugged, because it performs breakpoint sliding on
-   * generated locations. Breakpoint sliding should be performed on original
-   * locations, because there is no guarantee that the next line in the
-   * generated source corresponds to the next line in an original source.
-   *
-   * The only place this method is still used is from setBreakpointForActor
-   * when called for a source mapped source. Once that code has been refactored,
-   * this method can be removed.
-   *
-   * @param BreakpointActor actor
-   *        The BreakpointActor to be set as a breakpoint handler.
-   * @param GeneratedLocation generatedLocation
-   *        A GeneratedLocation representing the location in the generated
-   *        source for which the given BreakpointActor is to be set as a
-   *        breakpoint handler.
-   *
-   * @returns A Boolean that is true if the BreakpointActor was set as a
-   *          breakpoint handler on at least one script, and false otherwise.
-   */
-  _setBreakpointForActorAtLocationWithSliding: function (actor, generatedLocation) {
     let originalLocation = actor.originalLocation;
     let { generatedLine, generatedColumn } = generatedLocation;
 
@@ -3137,6 +2967,10 @@ SourceActor.prototype = {
       }
       actor.addScript(script, this.threadActor);
     }
+
+    return {
+      actor: actor.actorID
+    };
   },
 
   /**
diff --git a/toolkit/devtools/server/actors/utils/ScriptStore.js b/toolkit/devtools/server/actors/utils/ScriptStore.js
index a1e5d8a1e70d..9d9a557057e6 100644
--- a/toolkit/devtools/server/actors/utils/ScriptStore.js
+++ b/toolkit/devtools/server/actors/utils/ScriptStore.js
@@ -79,12 +79,6 @@ ScriptStore.prototype = {
     return this._scripts.items;
   },
 
-  getScriptsBySourceActor(sourceActor) {
-    return sourceActor.source ?
-           this.getScriptsBySource(sourceActor.source) :
-           this.getScriptsByURL(sourceActor._originalUrl);
-  },
-
   getScriptsBySourceActorAndLine(sourceActor, line) {
     return sourceActor.source ?
            this.getScriptsBySourceAndLine(sourceActor.source, line) :

From 4191e9ac61511b0f992bf5e874fbc37bbd14b147 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Fri, 20 Mar 2015 14:30:49 +0000
Subject: [PATCH 27/80] Bug 1141133 - Implement encrypt/decrypt of context
 information ready for Loop's context in conversation work. r=mikedeboer

---
 .../loop/content/shared/js/crypto.js          | 238 +++++++++++
 .../loop/content/shared/js/utils.js           | 228 ++++++++++-
 .../loop/test/shared/crypto_test.js           | 113 ++++++
 .../components/loop/test/shared/index.html    |   3 +
 .../components/loop/test/shared/utils_test.js |  47 +++
 .../shared/vendor/chai-as-promised-4.3.0.js   | 377 ++++++++++++++++++
 6 files changed, 1005 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/loop/content/shared/js/crypto.js
 create mode 100644 browser/components/loop/test/shared/crypto_test.js
 create mode 100644 browser/components/loop/test/shared/vendor/chai-as-promised-4.3.0.js

diff --git a/browser/components/loop/content/shared/js/crypto.js b/browser/components/loop/content/shared/js/crypto.js
new file mode 100644
index 000000000000..fd2abb648541
--- /dev/null
+++ b/browser/components/loop/content/shared/js/crypto.js
@@ -0,0 +1,238 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop:true */
+
+var loop = loop || {};
+
+loop.crypto = (function() {
+  "use strict";
+
+  var ALGORITHM = "AES-GCM";
+  var KEY_LENGTH = 128;
+  // We use JSON web key formats for the generated keys.
+  // https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
+  var KEY_FORMAT = "jwk";
+  // This is the JSON web key type from the generateKey algorithm.
+  var KEY_TYPE = "oct";
+  var ENCRYPT_TAG_LENGTH = 128;
+  var INITIALIZATION_VECTOR_LENGTH = 12;
+
+  var sharedUtils = loop.shared.utils;
+
+  /**
+   * Root object, by default set to window.
+   * @type {DOMWindow|Object}
+   */
+  var rootObject = window;
+
+  /**
+   * Sets a new root object.  This is useful for testing crypto not supported as
+   * it allows us to fake crypto not being present.
+   * In beforeEach(), loop.crypto.setRootObject is used to
+   * substitute a fake window, and in afterEach(), the real window object is
+   * replaced.
+   *
+   * @param {Object}
+   */
+  function setRootObject(obj) {
+    console.log("loop.crpyto.mixins: rootObject set to " + obj);
+    rootObject = obj;
+  }
+
+  /**
+   * Determines if Web Crypto is supported by this browser.
+   *
+   * @return {Boolean} True if Web Crypto is supported
+   */
+  function isSupported() {
+    return "crypto" in rootObject;
+  }
+
+  /**
+   * Generates a random key using the Web Crypto libraries.
+   *
+   * @return {Promise} A promise which is rejected on failure, or resolved
+   *                   with a string that is in the JSON web key format.
+   */
+  function generateKey() {
+    if (!isSupported()) {
+      throw new Error("Web Crypto is not supported");
+    }
+
+    return new Promise(function(resolve, reject) {
+      // First get a crypto key.
+      rootObject.crypto.subtle.generateKey({name: ALGORITHM, length: KEY_LENGTH },
+        // `true` means that the key can be extracted from the CryptoKey object.
+        true,
+        // Usages for the key.
+        ["encrypt", "decrypt"]
+      ).then(function(cryptoKey) {
+        // Now extract the key in the JSON web key format.
+        return rootObject.crypto.subtle.exportKey(KEY_FORMAT, cryptoKey);
+      }).then(function(exportedKey) {
+        // Lastly resolve the promise with the new key.
+        resolve(exportedKey.k);
+      }).catch(function(error) {
+        reject(error);
+      });
+    });
+  }
+
+  /**
+   * Encrypts an object using the specified key.
+   *
+   * @param {String} key      The key to use for encryption. This should have
+   *                          been generated by generateKey.
+   * @param {String} data     The string to be encrypted.
+   *
+   * @return {Promise} A promise which is rejected on failure, or resolved
+   *                   with a string that is the encrypted context.
+   */
+  function encryptBytes(key, data) {
+    if (!isSupported()) {
+      throw new Error("Web Crypto is not supported");
+    }
+
+    var iv = new Uint8Array(INITIALIZATION_VECTOR_LENGTH);
+
+    return new Promise(function(resolve, reject) {
+      // First import the key to a format we can use.
+      rootObject.crypto.subtle.importKey(KEY_FORMAT,
+        {k: key, kty: KEY_TYPE},
+        ALGORITHM,
+        // If the key is extractable.
+        true,
+        // What we're using it for.
+        ["encrypt"]
+      ).then(function(cryptoKey) {
+        // Now we've got the cryptoKey, we can do the actual encryption.
+
+        // First get the data into the format we need.
+        var dataBuffer = sharedUtils.strToUint8Array(data);
+
+        // It is critically important to change the IV any time the
+        // encrypted information is updated.
+        rootObject.crypto.getRandomValues(iv);
+
+        return rootObject.crypto.subtle.encrypt({
+            name: ALGORITHM,
+            iv: iv,
+            tagLength: ENCRYPT_TAG_LENGTH
+          }, cryptoKey,
+          dataBuffer);
+      }).then(function(cipherText) {
+        // Join the initialization vector and context for returning.
+        var joinedData = _mergeIVandCipherText(iv, new DataView(cipherText));
+
+        // Now convert to a string and base-64 encode.
+        var encryptedData = loop.shared.utils.btoa(joinedData);
+
+        resolve(encryptedData);
+      }).catch(function(error) {
+        reject(error);
+      });
+    });
+  }
+
+  /**
+   * Decrypts an object using the specified key.
+   *
+   * @param {String} key           The key to use for encryption. This should have
+   *                               been generated by generateKey.
+   * @param {String} encryptedData The encrypted context.
+   * @return {Promise} A promise which is rejected on failure, or resolved
+   *                   with a string that is the decrypted context.
+   */
+  function decryptBytes(key, encryptedData) {
+    if (!isSupported()) {
+      throw new Error("Web Crypto is not supported");
+    }
+
+    return new Promise(function(resolve, reject) {
+      // First import the key to a format we can use.
+      rootObject.crypto.subtle.importKey(KEY_FORMAT,
+        {k: key, kty: KEY_TYPE},
+        ALGORITHM,
+        // If the key is extractable.
+        true,
+        // What we're using it for.
+        ["decrypt"]
+      ).then(function(cryptoKey) {
+        // Now we've got the key, start the decryption.
+        var splitData = _splitIVandCipherText(encryptedData);
+
+        return rootObject.crypto.subtle.decrypt({
+          name: ALGORITHM,
+          iv: splitData.iv,
+          tagLength: ENCRYPT_TAG_LENGTH
+        }, cryptoKey, splitData.cipherText);
+      }).then(function(plainText) {
+        // Now we just turn it back into a string and then an object.
+        resolve(sharedUtils.Uint8ArrayToStr(new Uint8Array(plainText)));
+      }).catch(function(error) {
+        reject(error);
+      });
+    });
+  }
+
+  /**
+   * Appends the cipher text to the end of the initialization vector and
+   * returns the result.
+   *
+   * @param {Uint8Array} ivArray The array of initialization vector values.
+   * @param {DataView} cipherTextDataView The cipherText in data view format.
+   * @return {Uint8Array} An array of the IV and cipherText.
+   */
+  function _mergeIVandCipherText(ivArray, cipherTextDataView) {
+    // First we translate the data view to an array so we can get
+    // the length.
+    var cipherText = new Uint8Array(cipherTextDataView.buffer);
+    var cipherTextLength = cipherText.length;
+
+    var joinedContext = new Uint8Array(INITIALIZATION_VECTOR_LENGTH + cipherTextLength);
+
+    var i;
+    for (i = 0; i < INITIALIZATION_VECTOR_LENGTH; i++) {
+      joinedContext[i] = ivArray[i];
+    }
+
+    for (i = 0; i < cipherTextLength; i++) {
+      joinedContext[i + INITIALIZATION_VECTOR_LENGTH] = cipherText[i];
+    }
+
+    return joinedContext;
+  }
+
+  /**
+   * Takes the IV from the start of the passed in array and separates
+   * out the cipher text.
+   *
+   * @param {String} encryptedData Encrypted data in base64 format.
+   * @return {Object} An object consisting of two items: iv and cipherText,
+   *                  both are Uint8Arrays.
+   */
+  function _splitIVandCipherText(encryptedData) {
+    // Convert into byte arrays.
+    var encryptedDataArray = loop.shared.utils.atob(encryptedData);
+
+    // Now split out the initialization vector and the cipherText.
+    var iv = encryptedDataArray.slice(0, INITIALIZATION_VECTOR_LENGTH);
+    var cipherText = encryptedDataArray.slice(INITIALIZATION_VECTOR_LENGTH,
+                                              encryptedDataArray.length);
+
+    return {
+      iv: iv,
+      cipherText: cipherText
+    };
+  }
+
+  return {
+    decryptBytes: decryptBytes,
+    encryptBytes: encryptBytes,
+    generateKey: generateKey,
+    isSupported: isSupported,
+    setRootObject: setRootObject
+  };
+})();
diff --git a/browser/components/loop/content/shared/js/utils.js b/browser/components/loop/content/shared/js/utils.js
index 7a49e2ea7cbe..556dac2095c0 100644
--- a/browser/components/loop/content/shared/js/utils.js
+++ b/browser/components/loop/content/shared/js/utils.js
@@ -168,6 +168,228 @@ loop.shared.utils = (function(mozL10n) {
     );
   }
 
+  /**
+   * Binary-compatible Base64 decoding.
+   *
+   * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+   *
+   * @param {String} base64str The string to decode.
+   * @return {Uint8Array} The decoded result in array format.
+   */
+  function atob(base64str) {
+    var strippedEncoding = base64str.replace(/[^A-Za-z0-9\+\/]/g, "");
+    var inLength = strippedEncoding.length;
+    var outLength = inLength * 3 + 1 >> 2;
+    var result = new Uint8Array(outLength);
+
+    var mod3;
+    var mod4;
+    var uint24 = 0;
+    var outIndex = 0;
+
+    for (var inIndex = 0; inIndex < inLength; inIndex++) {
+      mod4 = inIndex & 3;
+      uint24 |= _b64ToUint6(strippedEncoding.charCodeAt(inIndex)) << 6 * (3 - mod4);
+
+      if (mod4 === 3 || inLength - inIndex === 1) {
+        for (mod3 = 0; mod3 < 3 && outIndex < outLength; mod3++, outIndex++) {
+          result[outIndex] = uint24 >>> (16 >>> mod3 & 24) & 255;
+        }
+        uint24 = 0;
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Binary-compatible Base64 encoding.
+   *
+   * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+   *
+   * @param {Uint8Array} bytes The data to encode.
+   * @return {String} The base64 encoded string.
+   */
+  function btoa(bytes) {
+    var mod3 = 2;
+    var result = "";
+    var length = bytes.length;
+    var uint24 = 0;
+
+    for (var index = 0; index < length; index++) {
+      mod3 = index % 3;
+      if (index > 0 && (index * 4 / 3) % 76 === 0) {
+        result += "\r\n";
+      }
+      uint24 |= bytes[index] << (16 >>> mod3 & 24);
+      if (mod3 === 2 || length - index === 1) {
+        result += String.fromCharCode(_uint6ToB64(uint24 >>> 18 & 63),
+          _uint6ToB64(uint24 >>> 12 & 63),
+          _uint6ToB64(uint24 >>> 6 & 63),
+          _uint6ToB64(uint24 & 63));
+        uint24 = 0;
+      }
+    }
+
+    return result.substr(0, result.length - 2 + mod3) +
+      (mod3 === 2 ? "" : mod3 === 1 ? "=" : "==");
+  }
+
+  /**
+   * Utility function to decode a base64 character into an integer.
+   *
+   * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+   *
+   * @param {Number} chr The character code to decode.
+   * @return {Number} The decoded value.
+   */
+  function _b64ToUint6 (chr) {
+    return chr > 64 && chr < 91  ? chr - 65 :
+           chr > 96 && chr < 123 ? chr - 71 :
+           chr > 47 && chr < 58  ? chr + 4  :
+           chr === 43            ? 62       :
+           chr === 47            ? 63       : 0;
+  }
+
+  /**
+   * Utility function to encode an integer into a base64 character code.
+   *
+   * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+   *
+   * @param {Number} uint6 The number to encode.
+   * @return {Number} The encoded value.
+   */
+  function _uint6ToB64 (uint6) {
+    return uint6 < 26   ? uint6 + 65 :
+           uint6 < 52   ? uint6 + 71 :
+           uint6 < 62   ? uint6 - 4  :
+           uint6 === 62 ? 43         :
+           uint6 === 63 ? 47         : 65;
+  }
+
+  /**
+   * Utility function to convert a string into a uint8 array.
+   *
+   * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+   *
+   * @param {String} inString The string to convert.
+   * @return {Uint8Array} The converted string in array format.
+   */
+  function strToUint8Array(inString) {
+    var inLength = inString.length;
+    var arrayLength = 0;
+    var chr;
+
+    // Mapping.
+    for (var mapIndex = 0; mapIndex < inLength; mapIndex++) {
+      chr = inString.charCodeAt(mapIndex);
+      arrayLength += chr < 0x80      ? 1 :
+                     chr < 0x800     ? 2 :
+                     chr < 0x10000   ? 3 :
+                     chr < 0x200000  ? 4 :
+                     chr < 0x4000000 ? 5 : 6;
+    }
+
+    var result = new Uint8Array(arrayLength);
+    var index = 0;
+
+    // Transcription.
+    for (var chrIndex = 0; index < arrayLength; chrIndex++) {
+      chr = inString.charCodeAt(chrIndex);
+      if (chr < 128) {
+        // One byte.
+        result[index++] = chr;
+      } else if (chr < 0x800) {
+        // Two bytes.
+        result[index++] = 192 + (chr >>> 6);
+        result[index++] = 128 + (chr & 63);
+      } else if (chr < 0x10000) {
+        // Three bytes.
+        result[index++] = 224 + (chr >>> 12);
+        result[index++] = 128 + (chr >>> 6 & 63);
+        result[index++] = 128 + (chr & 63);
+      } else if (chr < 0x200000) {
+        // Four bytes.
+        result[index++] = 240 + (chr >>> 18);
+        result[index++] = 128 + (chr >>> 12 & 63);
+        result[index++] = 128 + (chr >>> 6 & 63);
+        result[index++] = 128 + (chr & 63);
+      } else if (chr < 0x4000000) {
+        // Five bytes.
+        result[index++] = 248 + (chr >>> 24);
+        result[index++] = 128 + (chr >>> 18 & 63);
+        result[index++] = 128 + (chr >>> 12 & 63);
+        result[index++] = 128 + (chr >>> 6 & 63);
+        result[index++] = 128 + (chr & 63);
+      } else { // if (chr <= 0x7fffffff)
+        // Six bytes.
+        result[index++] = 252 + (chr >>> 30);
+        result[index++] = 128 + (chr >>> 24 & 63);
+        result[index++] = 128 + (chr >>> 18 & 63);
+        result[index++] = 128 + (chr >>> 12 & 63);
+        result[index++] = 128 + (chr >>> 6 & 63);
+        result[index++] = 128 + (chr & 63);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Utility function to change a uint8 based integer array to a string.
+   *
+   * Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+   *
+   * @param {Uint8Array} arrayBytes Array to convert.
+   * @param {String} The array as a string.
+   */
+  function Uint8ArrayToStr(arrayBytes) {
+    var result = "";
+    var length = arrayBytes.length;
+    var part;
+
+    for (var index = 0; index < length; index++) {
+      part = arrayBytes[index];
+      result += String.fromCharCode(
+        part > 251 && part < 254 && index + 5 < length ?
+          // Six bytes.
+          // (part - 252 << 30) may be not so safe in ECMAScript! So...:
+          (part - 252) * 1073741824 +
+          (arrayBytes[++index] - 128 << 24) +
+          (arrayBytes[++index] - 128 << 18) +
+          (arrayBytes[++index] - 128 << 12) +
+          (arrayBytes[++index] - 128 << 6) +
+           arrayBytes[++index] - 128 :
+        part > 247 && part < 252 && index + 4 < length ?
+          // Five bytes.
+          (part - 248 << 24) +
+          (arrayBytes[++index] - 128 << 18) +
+          (arrayBytes[++index] - 128 << 12) +
+          (arrayBytes[++index] - 128 << 6) +
+           arrayBytes[++index] - 128 :
+        part > 239 && part < 248 && index + 3 < length ?
+          // Four bytes.
+          (part - 240 << 18) +
+          (arrayBytes[++index] - 128 << 12) +
+          (arrayBytes[++index] - 128 << 6) +
+           arrayBytes[++index] - 128 :
+        part > 223 && part < 240 && index + 2 < length ?
+          // Three bytes.
+          (part - 224 << 12) +
+          (arrayBytes[++index] - 128 << 6) +
+           arrayBytes[++index] - 128 :
+        part > 191 && part < 224 && index + 1 < length ?
+          // Two bytes.
+          (part - 192 << 6) +
+           arrayBytes[++index] - 128 :
+          // One byte.
+          part
+      );
+    }
+
+    return result;
+  }
+
   return {
     CALL_TYPES: CALL_TYPES,
     FAILURE_DETAILS: FAILURE_DETAILS,
@@ -183,6 +405,10 @@ loop.shared.utils = (function(mozL10n) {
     isFirefoxOS: isFirefoxOS,
     isOpera: isOpera,
     getUnsupportedPlatform: getUnsupportedPlatform,
-    locationData: locationData
+    locationData: locationData,
+    atob: atob,
+    btoa: btoa,
+    strToUint8Array: strToUint8Array,
+    Uint8ArrayToStr: Uint8ArrayToStr
   };
 })(document.mozL10n || navigator.mozL10n);
diff --git a/browser/components/loop/test/shared/crypto_test.js b/browser/components/loop/test/shared/crypto_test.js
new file mode 100644
index 000000000000..54329e936469
--- /dev/null
+++ b/browser/components/loop/test/shared/crypto_test.js
@@ -0,0 +1,113 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global loop, sinon */
+
+var expect = chai.expect;
+
+describe("loop.crypto", function() {
+  "use strict";
+
+  var sandbox, oldCrypto;
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function() {
+    sandbox.restore();
+    loop.crypto.setRootObject(window);
+  });
+
+  describe("#isSupported", function() {
+    it("should return true by default", function() {
+      expect(loop.crypto.isSupported()).eql(true);
+    });
+
+    it("should return false if crypto isn't supported", function() {
+      loop.crypto.setRootObject({});
+
+      expect(loop.crypto.isSupported()).eql(false);
+    });
+  });
+
+  describe("#generateKey", function() {
+    it("should throw if web crypto is not available", function() {
+      loop.crypto.setRootObject({});
+
+      expect(function() {
+        loop.crypto.generateKey();
+      }).to.Throw(/not supported/);
+    });
+
+    it("should generate a key", function() {
+      // The key is a random string, so we can't really test much else.
+      return expect(loop.crypto.generateKey()).to.eventually.be.a("string");
+    });
+  });
+
+  describe("#encryptBytes", function() {
+    it("should throw if web crypto is not available", function() {
+      loop.crypto.setRootObject({});
+
+      expect(function() {
+        loop.crypto.encryptBytes();
+      }).to.Throw(/not supported/);
+    });
+
+    it("should encrypt an object with a specific key", function() {
+      return expect(loop.crypto.encryptBytes("Wt2-bZKeHO2wnaq00ZM6Nw",
+        JSON.stringify({test: true}))).to.eventually.be.a("string");
+    });
+  });
+
+  describe("#decryptBytes", function() {
+    it("should throw if web crypto is not available", function() {
+      loop.crypto.setRootObject({});
+
+      expect(function() {
+        loop.crypto.decryptBytes();
+      }).to.Throw(/not supported/);
+    });
+
+    it("should decypt an object via a specific key", function() {
+      var key = "Wt2-bZKeHO2wnaq00ZM6Nw";
+      var encryptedContext = "XvN9FDEm/GtE/5Bx5ezpn7JVDeZrtwOJy2CBjTGgJ4L33HhHOqEW+5k=";
+
+      return expect(loop.crypto.decryptBytes(key, encryptedContext)).to.eventually.eql(JSON.stringify({test: true}));
+    });
+
+    it("should fail if the key didn't work", function() {
+      var bad = "Bad-bZKeHO2wnaq00ZM6Nw";
+      var encryptedContext = "TGZaAE3mqsBFK0GfheZXXDCaRKXJmIKJ8WzF0KBEl4Aldzf3iYlAsLQdA8XSXXvtJR2UYz+f";
+
+      return expect(loop.crypto.decryptBytes(bad, encryptedContext)).to.be.rejected;
+    });
+  });
+
+  describe("Full cycle", function() {
+    it("should be able to encrypt and decypt in a full cycle", function(done) {
+      var context = JSON.stringify({
+        contextObject: true,
+        UTF8String: "对话"
+      });
+
+      return loop.crypto.generateKey().then(function (key) {
+        loop.crypto.encryptBytes(key, context).then(function(encryptedContext) {
+          loop.crypto.decryptBytes(key, encryptedContext).then(function(decryptedContext) {
+            expect(decryptedContext).eql(context);
+            done();
+          }).catch(function(error) {
+            done(error);
+          });
+        }).catch(function(error) {
+          done(error);
+        });
+      }).catch(function(error) {
+        done(error);
+      });
+    });
+  });
+
+});
diff --git a/browser/components/loop/test/shared/index.html b/browser/components/loop/test/shared/index.html
index 20e4da4d1199..467ff2a82950 100644
--- a/browser/components/loop/test/shared/index.html
+++ b/browser/components/loop/test/shared/index.html
@@ -31,6 +31,7 @@
   <!-- test dependencies -->
   <script src="vendor/mocha-2.2.1.js"></script>
   <script src="vendor/chai-2.1.0.js"></script>
+  <script src="vendor/chai-as-promised-4.3.0.js"></script>
   <script src="vendor/sinon-1.13.0.js"></script>
   <script>
     /*global chai, mocha */
@@ -42,6 +43,7 @@
   <script src="../../content/shared/js/utils.js"></script>
   <script src="../../content/shared/js/models.js"></script>
   <script src="../../content/shared/js/mixins.js"></script>
+  <script src="../../content/shared/js/crypto.js"></script>
   <script src="../../content/shared/js/websocket.js"></script>
   <script src="../../content/shared/js/feedbackApiClient.js"></script>
   <script src="../../content/shared/js/validate.js"></script>
@@ -62,6 +64,7 @@
   <script src="models_test.js"></script>
   <script src="mixins_test.js"></script>
   <script src="utils_test.js"></script>
+  <script src="crypto_test.js"></script>
   <script src="views_test.js"></script>
   <script src="websocket_test.js"></script>
   <script src="feedbackApiClient_test.js"></script>
diff --git a/browser/components/loop/test/shared/utils_test.js b/browser/components/loop/test/shared/utils_test.js
index 8b98835b77b2..179e2f146f61 100644
--- a/browser/components/loop/test/shared/utils_test.js
+++ b/browser/components/loop/test/shared/utils_test.js
@@ -171,4 +171,51 @@ describe("loop.shared.utils", function() {
                               "subject", "body", "fake@invalid.tld");
     });
   });
+
+  describe("#btoa", function() {
+    it("should encode a basic base64 string", function() {
+      var result = sharedUtils.btoa(sharedUtils.strToUint8Array("crypto is great"));
+
+      expect(result).eql("Y3J5cHRvIGlzIGdyZWF0");
+    });
+
+    it("should pad encoded base64 strings", function() {
+      var result = sharedUtils.btoa(sharedUtils.strToUint8Array("crypto is grea"));
+
+      expect(result).eql("Y3J5cHRvIGlzIGdyZWE=");
+
+      result = sharedUtils.btoa(sharedUtils.strToUint8Array("crypto is gre"));
+
+      expect(result).eql("Y3J5cHRvIGlzIGdyZQ==");
+    });
+
+    it("should encode a non-unicode base64 string", function() {
+      var result = sharedUtils.btoa(sharedUtils.strToUint8Array("\uFDFD"));
+      expect(result).eql("77e9");
+    });
+  });
+
+  describe("#atob", function() {
+    it("should decode a basic base64 string", function() {
+      var result = sharedUtils.Uint8ArrayToStr(sharedUtils.atob("Y3J5cHRvIGlzIGdyZWF0"));
+
+      expect(result).eql("crypto is great");
+    });
+
+    it("should decode a padded base64 string", function() {
+      var result = sharedUtils.Uint8ArrayToStr(sharedUtils.atob("Y3J5cHRvIGlzIGdyZWE="));
+
+      expect(result).eql("crypto is grea");
+
+      result = sharedUtils.Uint8ArrayToStr(sharedUtils.atob("Y3J5cHRvIGlzIGdyZQ=="));
+
+      expect(result).eql("crypto is gre");
+    });
+
+    it("should decode a base64 string that has unicode characters", function() {
+      var result = sharedUtils.Uint8ArrayToStr(sharedUtils.atob("77e9"));
+
+      expect(result).eql("\uFDFD");
+    });
+  });
 });
diff --git a/browser/components/loop/test/shared/vendor/chai-as-promised-4.3.0.js b/browser/components/loop/test/shared/vendor/chai-as-promised-4.3.0.js
new file mode 100644
index 000000000000..f37c0ccb8dc7
--- /dev/null
+++ b/browser/components/loop/test/shared/vendor/chai-as-promised-4.3.0.js
@@ -0,0 +1,377 @@
+(function () {
+    "use strict";
+
+    // Module systems magic dance.
+
+    /* istanbul ignore else */
+    if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
+        // NodeJS
+        module.exports = chaiAsPromised;
+    } else if (typeof define === "function" && define.amd) {
+        // AMD
+        define(function () {
+            return chaiAsPromised;
+        });
+    } else {
+        /*global self: false */
+
+        // Other environment (usually <script> tag): plug in to global chai instance directly.
+        chai.use(chaiAsPromised);
+
+        // Expose as a property of the global object so that consumers can configure the `transferPromiseness` property.
+        self.chaiAsPromised = chaiAsPromised;
+    }
+
+    chaiAsPromised.transferPromiseness = function (assertion, promise) {
+        assertion.then = promise.then.bind(promise);
+    };
+
+    chaiAsPromised.transformAsserterArgs = function (values) {
+        return values;
+    };
+
+    function chaiAsPromised(chai, utils) {
+        var Assertion = chai.Assertion;
+        var assert = chai.assert;
+
+        function isJQueryPromise(thenable) {
+            return typeof thenable.always === "function" &&
+                   typeof thenable.done === "function" &&
+                   typeof thenable.fail === "function" &&
+                   typeof thenable.pipe === "function" &&
+                   typeof thenable.progress === "function" &&
+                   typeof thenable.state === "function";
+        }
+
+        function assertIsAboutPromise(assertion) {
+            if (typeof assertion._obj.then !== "function") {
+                throw new TypeError(utils.inspect(assertion._obj) + " is not a thenable.");
+            }
+            if (isJQueryPromise(assertion._obj)) {
+                throw new TypeError("Chai as Promised is incompatible with jQuery's thenables, sorry! Please use a " +
+                                    "Promises/A+ compatible library (see http://promisesaplus.com/).");
+            }
+        }
+
+        function method(name, asserter) {
+            utils.addMethod(Assertion.prototype, name, function () {
+                assertIsAboutPromise(this);
+                return asserter.apply(this, arguments);
+            });
+        }
+
+        function property(name, asserter) {
+            utils.addProperty(Assertion.prototype, name, function () {
+                assertIsAboutPromise(this);
+                return asserter.apply(this, arguments);
+            });
+        }
+
+        function doNotify(promise, done) {
+            promise.then(function () { done(); }, done);
+        }
+
+        // These are for clarity and to bypass Chai refusing to allow `undefined` as actual when used with `assert`.
+        function assertIfNegated(assertion, message, extra) {
+            assertion.assert(true, null, message, extra.expected, extra.actual);
+        }
+
+        function assertIfNotNegated(assertion, message, extra) {
+            assertion.assert(false, message, null, extra.expected, extra.actual);
+        }
+
+        function getBasePromise(assertion) {
+            // We need to chain subsequent asserters on top of ones in the chain already (consider
+            // `eventually.have.property("foo").that.equals("bar")`), only running them after the existing ones pass.
+            // So the first base-promise is `assertion._obj`, but after that we use the assertions themselves, i.e.
+            // previously derived promises, to chain off of.
+            return typeof assertion.then === "function" ? assertion : assertion._obj;
+        }
+
+        // Grab these first, before we modify `Assertion.prototype`.
+
+        var propertyNames = Object.getOwnPropertyNames(Assertion.prototype);
+
+        var propertyDescs = {};
+        propertyNames.forEach(function (name) {
+            propertyDescs[name] = Object.getOwnPropertyDescriptor(Assertion.prototype, name);
+        });
+
+        property("fulfilled", function () {
+            var that = this;
+            var derivedPromise = getBasePromise(that).then(
+                function (value) {
+                    that._obj = value;
+                    assertIfNegated(that,
+                                    "expected promise not to be fulfilled but it was fulfilled with #{act}",
+                                    { actual: value });
+                    return value;
+                },
+                function (reason) {
+                    assertIfNotNegated(that,
+                                       "expected promise to be fulfilled but it was rejected with #{act}",
+                                       { actual: reason });
+                }
+            );
+
+            chaiAsPromised.transferPromiseness(that, derivedPromise);
+        });
+
+        property("rejected", function () {
+            var that = this;
+            var derivedPromise = getBasePromise(that).then(
+                function (value) {
+                    that._obj = value;
+                    assertIfNotNegated(that,
+                                       "expected promise to be rejected but it was fulfilled with #{act}",
+                                       { actual: value });
+                    return value;
+                },
+                function (reason) {
+                    assertIfNegated(that,
+                                    "expected promise not to be rejected but it was rejected with #{act}",
+                                    { actual: reason });
+
+                    // Return the reason, transforming this into a fulfillment, to allow further assertions, e.g.
+                    // `promise.should.be.rejected.and.eventually.equal("reason")`.
+                    return reason;
+                }
+            );
+
+            chaiAsPromised.transferPromiseness(that, derivedPromise);
+        });
+
+        method("rejectedWith", function (Constructor, message) {
+            var desiredReason = null;
+            var constructorName = null;
+
+            if (Constructor instanceof RegExp || typeof Constructor === "string") {
+                message = Constructor;
+                Constructor = null;
+            } else if (Constructor && Constructor instanceof Error) {
+                desiredReason = Constructor;
+                Constructor = null;
+                message = null;
+            } else if (typeof Constructor === "function") {
+                constructorName = (new Constructor()).name;
+            } else {
+                Constructor = null;
+            }
+
+            var that = this;
+            var derivedPromise = getBasePromise(that).then(
+                function (value) {
+                    var assertionMessage = null;
+                    var expected = null;
+
+                    if (Constructor) {
+                        assertionMessage = "expected promise to be rejected with #{exp} but it was fulfilled with " +
+                                           "#{act}";
+                        expected = constructorName;
+                    } else if (message) {
+                        var verb = message instanceof RegExp ? "matching" : "including";
+                        assertionMessage = "expected promise to be rejected with an error " + verb + " #{exp} but it " +
+                                           "was fulfilled with #{act}";
+                        expected = message;
+                    } else if (desiredReason) {
+                        assertionMessage = "expected promise to be rejected with #{exp} but it was fulfilled with " +
+                                           "#{act}";
+                        expected = desiredReason;
+                    }
+
+                    that._obj = value;
+
+                    assertIfNotNegated(that, assertionMessage, { expected: expected, actual: value });
+                },
+                function (reason) {
+                    if (Constructor) {
+                        that.assert(reason instanceof Constructor,
+                                    "expected promise to be rejected with #{exp} but it was rejected with #{act}",
+                                    "expected promise not to be rejected with #{exp} but it was rejected with #{act}",
+                                    constructorName,
+                                    reason);
+                    }
+
+                    var reasonMessage = utils.type(reason) === "object" && "message" in reason ?
+                                            reason.message :
+                                            "" + reason;
+                    if (message && reasonMessage !== null && reasonMessage !== undefined) {
+                        if (message instanceof RegExp) {
+                            that.assert(message.test(reasonMessage),
+                                        "expected promise to be rejected with an error matching #{exp} but got #{act}",
+                                        "expected promise not to be rejected with an error matching #{exp}",
+                                        message,
+                                        reasonMessage);
+                        }
+                        if (typeof message === "string") {
+                            that.assert(reasonMessage.indexOf(message) !== -1,
+                                        "expected promise to be rejected with an error including #{exp} but got #{act}",
+                                        "expected promise not to be rejected with an error including #{exp}",
+                                        message,
+                                        reasonMessage);
+                        }
+                    }
+
+                    if (desiredReason) {
+                        that.assert(reason === desiredReason,
+                                    "expected promise to be rejected with #{exp} but it was rejected with #{act}",
+                                    "expected promise not to be rejected with #{exp}",
+                                    desiredReason,
+                                    reason);
+                    }
+                }
+            );
+
+            chaiAsPromised.transferPromiseness(that, derivedPromise);
+        });
+
+        property("eventually", function () {
+            utils.flag(this, "eventually", true);
+        });
+
+        method("notify", function (done) {
+            doNotify(getBasePromise(this), done);
+        });
+
+        method("become", function (value) {
+            return this.eventually.deep.equal(value);
+        });
+
+        ////////
+        // `eventually`
+
+        // We need to be careful not to trigger any getters, thus `Object.getOwnPropertyDescriptor` usage.
+        var methodNames = propertyNames.filter(function (name) {
+            return name !== "assert" && typeof propertyDescs[name].value === "function";
+        });
+
+        methodNames.forEach(function (methodName) {
+            Assertion.overwriteMethod(methodName, function (originalMethod) {
+                return function () {
+                    doAsserterAsyncAndAddThen(originalMethod, this, arguments);
+                };
+            });
+        });
+
+        var getterNames = propertyNames.filter(function (name) {
+            return name !== "_obj" && typeof propertyDescs[name].get === "function";
+        });
+
+        getterNames.forEach(function (getterName) {
+            var propertyDesc = propertyDescs[getterName];
+
+            // Chainable methods are things like `an`, which can work both for `.should.be.an.instanceOf` and as
+            // `should.be.an("object")`. We need to handle those specially.
+            var isChainableMethod = false;
+            try {
+                isChainableMethod = typeof propertyDesc.get.call({}) === "function";
+            } catch (e) { }
+
+            if (isChainableMethod) {
+                Assertion.addChainableMethod(
+                    getterName,
+                    function () {
+                        var assertion = this;
+                        function originalMethod() {
+                            return propertyDesc.get.call(assertion).apply(assertion, arguments);
+                        }
+                        doAsserterAsyncAndAddThen(originalMethod, this, arguments);
+                    },
+                    function () {
+                        var originalGetter = propertyDesc.get;
+                        doAsserterAsyncAndAddThen(originalGetter, this);
+                    }
+                );
+            } else {
+                Assertion.overwriteProperty(getterName, function (originalGetter) {
+                    return function () {
+                        doAsserterAsyncAndAddThen(originalGetter, this);
+                    };
+                });
+            }
+        });
+
+        function doAsserterAsyncAndAddThen(asserter, assertion, args) {
+            // Since we're intercepting all methods/properties, we need to just pass through if they don't want
+            // `eventually`, or if we've already fulfilled the promise (see below).
+            if (!utils.flag(assertion, "eventually")) {
+                return asserter.apply(assertion, args);
+            }
+
+            var derivedPromise = getBasePromise(assertion).then(function (value) {
+                // Set up the environment for the asserter to actually run: `_obj` should be the fulfillment value, and
+                // now that we have the value, we're no longer in "eventually" mode, so we won't run any of this code,
+                // just the base Chai code that we get to via the short-circuit above.
+                assertion._obj = value;
+                utils.flag(assertion, "eventually", false);
+
+                return args ? chaiAsPromised.transformAsserterArgs(args) : args;
+            }).then(function (args) {
+                asserter.apply(assertion, args);
+
+                // Because asserters, for example `property`, can change the value of `_obj` (i.e. change the "object"
+                // flag), we need to communicate this value change to subsequent chained asserters. Since we build a
+                // promise chain paralleling the asserter chain, we can use it to communicate such changes.
+                return assertion._obj;
+            });
+
+            chaiAsPromised.transferPromiseness(assertion, derivedPromise);
+        }
+
+        ///////
+        // Now use the `Assertion` framework to build an `assert` interface.
+        var originalAssertMethods = Object.getOwnPropertyNames(assert).filter(function (propName) {
+            return typeof assert[propName] === "function";
+        });
+
+        assert.isFulfilled = function (promise, message) {
+            return (new Assertion(promise, message)).to.be.fulfilled;
+        };
+
+        assert.isRejected = function (promise, toTestAgainst, message) {
+            if (typeof toTestAgainst === "string") {
+                message = toTestAgainst;
+                toTestAgainst = undefined;
+            }
+
+            var assertion = (new Assertion(promise, message));
+            return toTestAgainst !== undefined ? assertion.to.be.rejectedWith(toTestAgainst) : assertion.to.be.rejected;
+        };
+
+        assert.becomes = function (promise, value, message) {
+            return assert.eventually.deepEqual(promise, value, message);
+        };
+
+        assert.doesNotBecome = function (promise, value, message) {
+            return assert.eventually.notDeepEqual(promise, value, message);
+        };
+
+        assert.eventually = {};
+        originalAssertMethods.forEach(function (assertMethodName) {
+            assert.eventually[assertMethodName] = function (promise) {
+                var otherArgs = Array.prototype.slice.call(arguments, 1);
+
+                var customRejectionHandler;
+                var message = arguments[assert[assertMethodName].length - 1];
+                if (typeof message === "string") {
+                    customRejectionHandler = function (reason) {
+                        throw new chai.AssertionError(message + "\n\nOriginal reason: " + utils.inspect(reason));
+                    };
+                }
+
+                var returnedPromise = promise.then(
+                    function (fulfillmentValue) {
+                        return assert[assertMethodName].apply(assert, [fulfillmentValue].concat(otherArgs));
+                    },
+                    customRejectionHandler
+                );
+
+                returnedPromise.notify = function (done) {
+                    doNotify(returnedPromise, done);
+                };
+
+                return returnedPromise;
+            };
+        });
+    }
+}());

From 74807d4a35cc14d2875cbdf77d74ad71b2e6893c Mon Sep 17 00:00:00 2001
From: Manan Doshi <manan.doshi96@gmail.com>
Date: Sat, 17 Jan 2015 21:36:00 -0500
Subject: [PATCH 28/80] Bug 1113471 - Fixed OS.Constants.Win.GENERIC_READ by
 changing the datatype of GENERIC_READ to UINT_CONSTANT. r=yoric

---
 dom/system/OSFileConstants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp
index aef51f0188e3..d9d55e252e7b 100644
--- a/dom/system/OSFileConstants.cpp
+++ b/dom/system/OSFileConstants.cpp
@@ -709,7 +709,7 @@ static const dom::ConstantSpec gWinProperties[] =
   // CreateFile desired access
   INT_CONSTANT(GENERIC_ALL),
   INT_CONSTANT(GENERIC_EXECUTE),
-  INT_CONSTANT(GENERIC_READ),
+  UINT_CONSTANT(GENERIC_READ),
   INT_CONSTANT(GENERIC_WRITE),
 
   // CreateFile share mode

From 97be22fda311ecf17fc28a21fef9671018590755 Mon Sep 17 00:00:00 2001
From: Mason Chang <mchang@mozilla.com>
Date: Thu, 19 Mar 2015 16:15:10 -0700
Subject: [PATCH 29/80] Bug 1123762. Enable the vsync aligned refresh driver on
 b2g. r=kats

---
 b2g/app/b2g.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 7ac4f8bef109..9acfe369231f 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -1125,8 +1125,10 @@ pref("dom.requestSync.enabled", true);
 pref("gfx.vsync.hw-vsync.enabled", true);
 pref("gfx.vsync.compositor", true);
 pref("gfx.touch.resample", true);
+pref("gfx.vsync.refreshdriver", true);
 #else
 pref("gfx.vsync.hw-vsync.enabled", false);
 pref("gfx.vsync.compositor", false);
 pref("gfx.touch.resample", false);
+pref("gfx.vsync.refreshdriver", false);
 #endif

From 652924cc62c03fe8025e2fb5ed985f9eb12f99e6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 16:35:34 -0700
Subject: [PATCH 30/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9a65843a1370
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #28994 from KevinGrandon/bug_1143801_reland

Bug 1143801 - Enable GIJ for autolander

========

https://hg.mozilla.org/integration/gaia-central/rev/a7219fbb00a3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1143801 - Enable GIJ for autolander r=lightsofapollo
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 188af9b65213..c20360af18f2 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "8837f94418d69a0b06c1f4843b0779e2bb72165a", 
+        "git_revision": "8f08118f823080e8691280f818f9f03ded319e4d", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "e034a24fa2dcff4623dce2d91f7828d582abf50d", 
+    "revision": "9a65843a1370e3bd5a004795c7cf6683a73c1bb9", 
     "repo_path": "integration/gaia-central"
 }

From 5de682383b5c6d4c8d29f525ca1d23caa3e1d3f1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 16:38:12 -0700
Subject: [PATCH 31/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 2cfd5a330186..2b3123eb67e0 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 6e1b7677d2fa..7fe49737fedc 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 053a32aaa652..074956f24748 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index ac17c45aa4d9..f556bd8acea2 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 485aebe5221e..44328e63fe89 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 6e1b7677d2fa..7fe49737fedc 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index a5c5db15bbd0..8556615df17f 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ca73b17ff99d..9f331e117546 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index dee5391e631e..330903ef1eef 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index dff5dcde1753..6a22c3436543 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8837f94418d69a0b06c1f4843b0779e2bb72165a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 650a8828163a73d0da73b40ec3d42e505df1a42e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 17:10:33 -0700
Subject: [PATCH 32/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b37334d88cad
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1142798 - merge pull request #28997 from KevinGrandon:bug_1142798_autolander_jshint_mock_utility_tray to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/911b05e8db6f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1142798 - Autolander test bug - [System] Fix jshint for mock utility tray r=kgrandon
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c20360af18f2..2aacfc699d53 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "8f08118f823080e8691280f818f9f03ded319e4d", 
+        "git_revision": "da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "9a65843a1370e3bd5a004795c7cf6683a73c1bb9", 
+    "revision": "b37334d88cad4170579d6040b25b5f77db117f14", 
     "repo_path": "integration/gaia-central"
 }

From 24013fad1b93c875260b48d6dc824cd620a1682b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 17:13:36 -0700
Subject: [PATCH 33/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 4 ++--
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 4 ++--
 b2g/config/emulator-kk/sources.xml  | 4 ++--
 b2g/config/emulator-l/sources.xml   | 4 ++--
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 4 ++--
 b2g/config/flame/sources.xml        | 4 ++--
 b2g/config/nexus-4/sources.xml      | 4 ++--
 b2g/config/nexus-5-l/sources.xml    | 4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 2b3123eb67e0..614af1b2e023 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -23,7 +23,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 7fe49737fedc..7b5d456652b9 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 074956f24748..f939b4421f50 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f556bd8acea2..dd516e44d447 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -23,7 +23,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="f92a936f2aa97526d4593386754bdbf02db07a12"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="6e47ff2790f5656b5b074407829ceecf3e6188c4"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 44328e63fe89..707c288f6f02 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -23,7 +23,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="50d1ca4ab8add54523b7bc692860d57e8ee4c0d1"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="fb3845864573857677f9b500040a8f011eaf5078"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 7fe49737fedc..7b5d456652b9 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 8556615df17f..8d8eebee8061 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -23,7 +23,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" revision="95bb5b66b3ec5769c3de8d3f25d681787418e7d2"/>
   <project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="ebdad82e61c16772f6cd47e9f11936bf6ebe9aa0"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 9f331e117546..4369108694ca 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,10 +17,10 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 330903ef1eef..27e6fe1049ac 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,10 +17,10 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 6a22c3436543..a056af244a39 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8f08118f823080e8691280f818f9f03ded319e4d"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -23,7 +23,7 @@
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
-  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="acca7d20b79978cff975e755e5e0bac9f731a6f7"/>
+  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
   <!-- Stock Android things -->
   <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.5" path="prebuilts/clang/linux-x86/host/3.5" revision="50d1ca4ab8add54523b7bc692860d57e8ee4c0d1"/>
   <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" revision="fb3845864573857677f9b500040a8f011eaf5078"/>

From 29c57e78e15a270ed8054cc580c6bc8a67aca63a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 17:26:54 -0700
Subject: [PATCH 34/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d0b3af954af0
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1143788 - merge pull request #28966 from sfoster:shb-emergency-callback-dialog-bug-1143788 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/4be5e751a55e
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1143788 - Adjust emergency callback dialog for SHB. r=kgrandon
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 2aacfc699d53..cb2c165eb4f3 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6", 
+        "git_revision": "00dcb9fb68752e436b81381637dc7f3ae0f119b1", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "b37334d88cad4170579d6040b25b5f77db117f14", 
+    "revision": "d0b3af954af090c700394ba26fb4b0bbafa4ba65", 
     "repo_path": "integration/gaia-central"
 }

From 5aa09b1e610d280cf8870966ca913281e1ec5c81 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 17:29:29 -0700
Subject: [PATCH 35/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 614af1b2e023..7ef3ee235727 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 7b5d456652b9..6ed074dfd452 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index f939b4421f50..9cc250442208 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index dd516e44d447..de68871ca8f8 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 707c288f6f02..3f0402b1fee2 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 7b5d456652b9..6ed074dfd452 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 8d8eebee8061..0cd51d2ce334 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 4369108694ca..7b276c7f0427 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 27e6fe1049ac..8215e0b8afd6 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index a056af244a39..c59c75509f19 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="da543d5e3c254ec4397a1cdf7a6cbdc387e1faa6"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 13e1a210b6503e24c3231be715edfa7f6e63ecf8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 18:05:25 -0700
Subject: [PATCH 36/80] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c85d164d3581
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #28910 from martasect/Bug_1139735

Bug 1139735 - [Settings] "short_name" is not used

========

https://hg.mozilla.org/integration/gaia-central/rev/767adc6e87b3
Author: Marta Piekarska <marta@sec.t-labs.tu-berlin.de>
Desc: Bug 1139735 - [Settings] "short_name" is not used in "Settings\>Privacy Controls\>Transparency Control\>Applications"

========

https://hg.mozilla.org/integration/gaia-central/rev/e3f362208bdc
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1107139 - merge pull request #28998 from KevinGrandon:bug_1107139_retry_autoland to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/e039f7c783fe
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1107139 - Show id-overlay when there's no screenshot. r=etienne
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index cb2c165eb4f3..be0100b7bb9c 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "00dcb9fb68752e436b81381637dc7f3ae0f119b1", 
+        "git_revision": "6e24aff11fbb385a6fb1651536a97263457b6c50", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "d0b3af954af090c700394ba26fb4b0bbafa4ba65", 
+    "revision": "c85d164d358127381e7eb9a08c16396659544687", 
     "repo_path": "integration/gaia-central"
 }

From 6da47b5699bd0f477fd614687144f1a846c754fd Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 18:07:58 -0700
Subject: [PATCH 37/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 7ef3ee235727..25345f244f4a 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 6ed074dfd452..88279142046a 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 9cc250442208..6c952fa50854 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index de68871ca8f8..fb3957c9cab0 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 3f0402b1fee2..fda374aed083 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 6ed074dfd452..88279142046a 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 0cd51d2ce334..9ac684667981 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 7b276c7f0427..0a46a5827f18 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 8215e0b8afd6..d4ad4e077475 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index c59c75509f19..31199a950dd2 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="00dcb9fb68752e436b81381637dc7f3ae0f119b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From f7b7e37f47fd42333eaa5fe55a0d584659301dca Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Fri, 20 Mar 2015 10:25:12 +0800
Subject: [PATCH 38/80] Bug 1120780 - Fallback on lock_ycbcr when
 ColorConvertor fails, r=sotaro

---
 gfx/layers/GrallocImages.cpp | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/gfx/layers/GrallocImages.cpp b/gfx/layers/GrallocImages.cpp
index 652348fe8b11..18d20e4caf48 100644
--- a/gfx/layers/GrallocImages.cpp
+++ b/gfx/layers/GrallocImages.cpp
@@ -274,10 +274,11 @@ static status_t
 ConvertOmxYUVFormatToRGB565(android::sp<GraphicBuffer>& aBuffer,
                             gfx::DataSourceSurface *aSurface,
                             gfx::DataSourceSurface::MappedSurface *aMappedSurface,
-                            const layers::PlanarYCbCrData& aYcbcrData,
-                            int aOmxFormat)
+                            const layers::PlanarYCbCrData& aYcbcrData)
 {
-  if (!aOmxFormat) {
+  uint32_t omxFormat =
+    GrallocImage::GetOmxFormat(aBuffer->getPixelFormat());
+  if (!omxFormat) {
     NS_WARNING("Unknown color format");
     return BAD_VALUE;
   }
@@ -359,7 +360,7 @@ ConvertOmxYUVFormatToRGB565(android::sp<GraphicBuffer>& aBuffer,
     return OK;
   }
 
-  android::ColorConverter colorConverter((OMX_COLOR_FORMATTYPE)aOmxFormat,
+  android::ColorConverter colorConverter((OMX_COLOR_FORMATTYPE)omxFormat,
                                          OMX_COLOR_Format16bitRGB565);
   if (!colorConverter.isValid()) {
     NS_WARNING("Invalid color conversion");
@@ -402,25 +403,16 @@ GrallocImage::GetAsSourceSurface()
   }
 
   int32_t rv;
-  uint32_t omxFormat = 0;
-
-  omxFormat = GrallocImage::GetOmxFormat(graphicBuffer->getPixelFormat());
-  if (!omxFormat) {
-    rv = ConvertVendorYUVFormatToRGB565(graphicBuffer, surface, &mappedSurface);
+  rv = ConvertOmxYUVFormatToRGB565(graphicBuffer, surface, &mappedSurface, mData);
+  if (rv == OK) {
     surface->Unmap();
-
-    if (rv != OK) {
-      NS_WARNING("Unknown color format");
-      return nullptr;
-    }
-
     return surface;
   }
 
-  rv = ConvertOmxYUVFormatToRGB565(graphicBuffer, surface, &mappedSurface, mData, omxFormat);
+  rv = ConvertVendorYUVFormatToRGB565(graphicBuffer, surface, &mappedSurface);
   surface->Unmap();
-
   if (rv != OK) {
+    NS_WARNING("Unknown color format");
     return nullptr;
   }
 

From 61ffc4b329edd553cc2dd085043d8f5039a350a6 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 20:32:21 -0700
Subject: [PATCH 39/80] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/65a3aac0e14d
Author: Wes Kocher <kwierso@gmail.com>
Desc: Revert "Merge pull request #28910 from martasect/Bug_1139735" for Gu test failures

This reverts commit 6e24aff11fbb385a6fb1651536a97263457b6c50, reversing
changes made to 9c6c6d38ab7c9864459e77e44648494b7c209a0b.
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index be0100b7bb9c..27ff07b9cd39 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "6e24aff11fbb385a6fb1651536a97263457b6c50", 
+        "git_revision": "7dc475d86c5b26c2348cc012509a47618e75a205", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "c85d164d358127381e7eb9a08c16396659544687", 
+    "revision": "65a3aac0e14d831901cb4c0a92a13a309e3a58b6", 
     "repo_path": "integration/gaia-central"
 }

From 221a3e1a2e1d84dff1074fb027e1c29c888f118d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 20:35:11 -0700
Subject: [PATCH 40/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 25345f244f4a..4a00f3f78182 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 88279142046a..8ca8f9668088 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6c952fa50854..bb6c5335321b 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fb3957c9cab0..f334e2497e95 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index fda374aed083..cfcc833b584b 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 88279142046a..8ca8f9668088 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 9ac684667981..011347954830 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 0a46a5827f18..c08ce275a131 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index d4ad4e077475..f32bbccfc98f 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 31199a950dd2..4f35c57cc34e 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="6e24aff11fbb385a6fb1651536a97263457b6c50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 4c1f2472ad108da6748d1bf0bfb47ae0e42c756e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 20:50:21 -0700
Subject: [PATCH 41/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9637789b987c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #29000 from crh0716/1145490

Bug 1145490 - Remove unsupported syntax and add the missing part of callng to the constructor from the document r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/220202be33ac
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1145490 - Remove unsupported syntax and add the missing part of calling to the constructor from the document
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 27ff07b9cd39..4611ee9fd892 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "7dc475d86c5b26c2348cc012509a47618e75a205", 
+        "git_revision": "3e3989820c47e611b81e4ed9a6d4b5a6912bf8db", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "65a3aac0e14d831901cb4c0a92a13a309e3a58b6", 
+    "revision": "9637789b987cf0534e0828e8fc61ae5b189b08a2", 
     "repo_path": "integration/gaia-central"
 }

From 1ca76f0129000ea950a3e59561f77769c1792a84 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 19 Mar 2015 20:52:55 -0700
Subject: [PATCH 42/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 4a00f3f78182..cef3a26ea434 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8ca8f9668088..f7f2e4e9c602 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index bb6c5335321b..a3d406dac001 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f334e2497e95..595dbe959ff2 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index cfcc833b584b..5e3242e1587a 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8ca8f9668088..f7f2e4e9c602 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 011347954830..0757b8cd148e 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index c08ce275a131..0f642f87fbfc 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f32bbccfc98f..a78cbe0e58f0 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 4f35c57cc34e..86c823fe02fa 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="7dc475d86c5b26c2348cc012509a47618e75a205"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 1defb746000e395b9eccb3923c52ae9177377913 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 02:45:27 -0700
Subject: [PATCH 43/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e5cd6f6ff1a5
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1143636 - merge pull request #28941 from mnjul:bug_1143636_wordlistconverter_variable_freq to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/ea0cc625c704
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1143636 - Allow word_list_converter.js to accpet variable word frequency information

- WordListConverter constructor accepts array of words, or array of {w: word, f: freq} objects
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 4611ee9fd892..c162d446dcdf 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "3e3989820c47e611b81e4ed9a6d4b5a6912bf8db", 
+        "git_revision": "dddd567dbe2ab3a355e3091eda3c04d3d00509d8", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "9637789b987cf0534e0828e8fc61ae5b189b08a2", 
+    "revision": "e5cd6f6ff1a53624d8015476f5a7430206d67d44", 
     "repo_path": "integration/gaia-central"
 }

From b73dba434694d03937bbaf676348aa32e2bff049 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 02:48:13 -0700
Subject: [PATCH 44/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index cef3a26ea434..4de893055f29 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f7f2e4e9c602..a142de08edc4 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index a3d406dac001..1f79343763a6 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 595dbe959ff2..2864711daf2b 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 5e3242e1587a..da6299cad8ea 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f7f2e4e9c602..a142de08edc4 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 0757b8cd148e..1916f0ada178 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 0f642f87fbfc..b7105ca59e9b 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index a78cbe0e58f0..413ccfffbc9a 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 86c823fe02fa..631b666e89b4 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="3e3989820c47e611b81e4ed9a6d4b5a6912bf8db"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 3207207fa4e0b8f56b1fc39ab09aa37786058aa1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 03:50:26 -0700
Subject: [PATCH 45/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/d33e7218307b
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1144054 - merge pull request #28948 from etiennesegonzac:1144054 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/c7615d5524ef
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1144054 - Disable edge gestures during app install prompts. r=alive
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c162d446dcdf..cacfa02b1fc5 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "dddd567dbe2ab3a355e3091eda3c04d3d00509d8", 
+        "git_revision": "640001a772e4c9bd35a8b0017f842b86fbab95a8", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "e5cd6f6ff1a53624d8015476f5a7430206d67d44", 
+    "revision": "d33e7218307bcc28da09e24660f5a46dbb3e643a", 
     "repo_path": "integration/gaia-central"
 }

From 580aa2bab74496a41fdb6d906b689d7bce3130e7 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 03:53:00 -0700
Subject: [PATCH 46/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 4de893055f29..02103a4d9541 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a142de08edc4..8b92342ea694 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 1f79343763a6..db2b08f46d02 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 2864711daf2b..f2734ecd87fd 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index da6299cad8ea..df40b59e1604 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a142de08edc4..8b92342ea694 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 1916f0ada178..dffeec185d7f 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index b7105ca59e9b..ab97f318160d 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 413ccfffbc9a..700f11c0b26d 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 631b666e89b4..fba88e721db2 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="dddd567dbe2ab3a355e3091eda3c04d3d00509d8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 16ab34d6ec550406a5b9191e0be3a912f013fc46 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Fri, 20 Mar 2015 00:45:00 +0100
Subject: [PATCH 47/80] Bug 1144080 - Disable reftests on Mulet for
 TaskCluster. r=ahal

---
 dom/canvas/test/reftest/reftest.list          | 98 +++++++++----------
 dom/html/reftests/reftest.list                |  2 +-
 gfx/tests/reftest/reftest.list                |  2 +-
 layout/reftests/abs-pos/reftest.list          |  2 +-
 layout/reftests/backgrounds/reftest.list      |  6 +-
 layout/reftests/border-image/reftest.list     |  2 +-
 layout/reftests/border-radius/reftest.list    | 14 +--
 layout/reftests/bugs/reftest.list             | 88 ++++++++---------
 layout/reftests/canvas/reftest.list           |  6 +-
 layout/reftests/css-blending/reftest.list     | 14 +--
 layout/reftests/css-gradients/reftest.list    | 44 ++++-----
 layout/reftests/first-line/reftest.list       |  2 +-
 layout/reftests/font-features/reftest.list    | 12 +--
 layout/reftests/font-matching/reftest.list    |  4 +-
 layout/reftests/forms/fieldset/reftest.list   |  2 +-
 layout/reftests/image/reftest.list            |  2 +-
 layout/reftests/line-breaking/reftest.list    |  2 +-
 layout/reftests/marquee/reftest.list          |  4 +-
 layout/reftests/mathml/reftest.list           |  4 +-
 layout/reftests/object/reftest.list           |  2 +-
 layout/reftests/outline/reftest.list          |  2 +-
 layout/reftests/pagination/reftest.list       |  2 +-
 .../horizontal/reftest_border_abspos.list     | 40 ++++----
 .../horizontal/reftest_border_parent.list     | 42 ++++----
 .../horizontal/reftest_margin_abspos.list     | 42 ++++----
 .../horizontal/reftest_margin_parent.list     | 42 ++++----
 .../horizontal/reftest_padding_abspos.list    | 40 ++++----
 .../horizontal/reftest_padding_parent.list    | 42 ++++----
 .../horizontal/reftest_plain.list             | 42 ++++----
 .../reftest_border_abspos.list                |  4 +-
 .../reftest_border_parent.list                |  4 +-
 .../reftest_margin_abspos.list                |  4 +-
 .../reftest_margin_parent.list                |  2 +-
 .../reftest_padding_abspos.list               |  4 +-
 .../reftest_padding_parent.list               |  4 +-
 .../mixed-abspos-root/reftest_plain.list      |  4 +-
 .../mixed/reftest_border_abspos.list          |  4 +-
 .../mixed/reftest_border_parent.list          |  4 +-
 .../mixed/reftest_margin_abspos.list          |  4 +-
 .../mixed/reftest_margin_parent.list          |  4 +-
 .../mixed/reftest_padding_abspos.list         |  4 +-
 .../mixed/reftest_padding_parent.list         |  4 +-
 .../mixed/reftest_plain.list                  |  4 +-
 .../relative/reftest.list                     |  8 +-
 .../vertical/reftest.listbackup               | 20 ++--
 .../vertical/reftest_border_abspos.list       | 28 +++---
 .../vertical/reftest_border_parent.list       | 30 +++---
 .../vertical/reftest_margin_abspos.list       | 30 +++---
 .../vertical/reftest_margin_parent.list       | 30 +++---
 .../vertical/reftest_padding_abspos.list      | 30 +++---
 .../vertical/reftest_padding_parent.list      | 30 +++---
 .../vertical/reftest_plain.list               | 30 +++---
 layout/reftests/printing/reftest.list         |  2 +-
 layout/reftests/reftest-sanity/reftest.list   |  4 +-
 layout/reftests/scrolling/reftest.list        | 14 +--
 layout/reftests/svg/as-image/reftest.list     |  4 +-
 layout/reftests/svg/reftest.list              | 28 +++---
 layout/reftests/table-overflow/reftest.list   |  2 +-
 layout/reftests/text-overflow/reftest.list    |  4 +-
 layout/reftests/text-transform/reftest.list   |  2 +-
 layout/reftests/text/reftest.list             |  8 +-
 layout/reftests/transform-3d/reftest.list     | 10 +-
 .../w3c-css/submitted/flexbox/reftest.list    |  2 +-
 layout/reftests/writing-mode/reftest.list     |  8 +-
 64 files changed, 491 insertions(+), 493 deletions(-)

diff --git a/dom/canvas/test/reftest/reftest.list b/dom/canvas/test/reftest/reftest.list
index 1e6915cd5501..1117c35173b7 100644
--- a/dom/canvas/test/reftest/reftest.list
+++ b/dom/canvas/test/reftest/reftest.list
@@ -39,73 +39,71 @@ pref(webgl.force-layers-readback,true)  == webgl-clear-test.html?readback wrappe
 # Does we draw the correct colors in the correct places?
 # Combinations: PowerSet([readback, aa, preserve, premult, alpha]) x [frame=1,frame=6]
 # This is 2^6 = 64 combinations.
-                                                                                                         == webgl-color-test.html?frame=1&__&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&aa&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&__&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&aa&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=1&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&__&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&aa&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&__&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&aa&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=1&__&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=1&aa&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=1&__&preserve&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=1&aa&preserve&_______&alpha  wrapper.html?colors-non-premult.png
-                                                                                                         == webgl-color-test.html?frame=1&__&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                         == webgl-color-test.html?frame=1&aa&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                         == webgl-color-test.html?frame=1&__&preserve&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                         == webgl-color-test.html?frame=1&aa&preserve&premult&alpha  wrapper.html?colors-premult.png
-
-                                                                                                         == webgl-color-test.html?frame=6&__&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=6&aa&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=6&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                          == webgl-color-test.html?frame=6&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=6&__&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=6&aa&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         == webgl-color-test.html?frame=6&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                          == webgl-color-test.html?frame=6&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&__&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&aa&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&__&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=1&aa&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&__&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&aa&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&__&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&aa&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=6&__&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=6&aa&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)     == webgl-color-test.html?frame=6&__&preserve&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&(!layersGPUAccelerated||!d2d))  == webgl-color-test.html?frame=6&aa&preserve&_______&alpha  wrapper.html?colors-non-premult.png
-                                                                                                         == webgl-color-test.html?frame=6&__&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                         == webgl-color-test.html?frame=6&aa&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                         == webgl-color-test.html?frame=6&__&preserve&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                         == webgl-color-test.html?frame=6&aa&preserve&premult&alpha  wrapper.html?colors-premult.png
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&__&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&aa&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&__&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                          == webgl-color-test.html?frame=6&aa&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&_______&alpha  wrapper.html?colors-non-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&premult&alpha  wrapper.html?colors-premult.png
-
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&__&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=1&readback&aa&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&_______&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&premult&_____  wrapper.html?colors-no-alpha.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&layersGPUAccelerated&&!d2d)    pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&_______&alpha  wrapper.html?colors-non-premult.png
 fuzzy(1,30000) fails-if(gtk2Widget&&browserIsRemote) fails-if(winWidget&&(!layersGPUAccelerated||!d2d)) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&_______&alpha  wrapper.html?colors-non-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&premult&alpha  wrapper.html?colors-premult.png
-                                                                                                        pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&premult&alpha  wrapper.html?colors-premult.png
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&________&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&__&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet)                                                                                                         pref(webgl.force-layers-readback,true)  == webgl-color-test.html?frame=6&readback&aa&preserve&premult&alpha  wrapper.html?colors-premult.png # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # Check for hanging bindings/state settings:
 == webgl-hanging-fb-test.html?__&________  wrapper.html?green.png
diff --git a/dom/html/reftests/reftest.list b/dom/html/reftests/reftest.list
index 434f03548c49..f03161b527e9 100644
--- a/dom/html/reftests/reftest.list
+++ b/dom/html/reftests/reftest.list
@@ -5,7 +5,7 @@ include toblob-todataurl/reftest.list
 skip-if(B2G) == 41464-1a.html 41464-1-ref.html
 skip-if(B2G) == 41464-1b.html 41464-1-ref.html
 == 52019-1.html 52019-1-ref.html
-== 82711-1.html 82711-1-ref.html
+skip-if(Mulet) == 82711-1.html 82711-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 82711-2.html 82711-2-ref.html
 != 82711-1-ref.html 82711-2-ref.html
 != 468263-1a.html about:blank
diff --git a/gfx/tests/reftest/reftest.list b/gfx/tests/reftest/reftest.list
index 1be25e64349b..f10dd7d5a383 100644
--- a/gfx/tests/reftest/reftest.list
+++ b/gfx/tests/reftest/reftest.list
@@ -1,5 +1,5 @@
 # 468496-1 will also detect bugs in video drivers.
 == 468496-1.html 468496-1-ref.html
 fuzzy-if(winWidget,175,443) == 611498-1.html 611498-ref.html
-skip-if(B2G) fuzzy-if(Android&&AndroidVersion>=15,8,1000) == 709477-1.html 709477-1-ref.html # bug 773482
+skip-if(Mulet) skip-if(B2G) fuzzy-if(Android&&AndroidVersion>=15,8,1000) == 709477-1.html 709477-1-ref.html # bug 773482 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(!asyncPanZoom) == 1086723.html 1086723-ref.html
diff --git a/layout/reftests/abs-pos/reftest.list b/layout/reftests/abs-pos/reftest.list
index 4965d8cc932c..6cd423a7907f 100644
--- a/layout/reftests/abs-pos/reftest.list
+++ b/layout/reftests/abs-pos/reftest.list
@@ -53,7 +53,7 @@ skip-if(B2G||Mulet) fuzzy-if(Android,9,185) == scrollframe-2.html scrollframe-2-
 fuzzy-if(gtk2Widget,1,8) == select-1.html select-1-ref.html
 fuzzy-if(gtk2Widget,1,8) == select-1-dynamic.html select-1-ref.html
 == select-2.html select-2-ref.html
-fuzzy-if(gtk2Widget,1,19) fuzzy-if(Android||B2G,17,726) == select-3.html select-3-ref.html
+fuzzy-if(gtk2Widget,1,19) fuzzy-if(Android||B2G,17,726) skip-if(Mulet) == select-3.html select-3-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == multi-column-1.html multi-column-1-ref.html
 == button-1.html button-1-ref.html
 == button-2.html button-2-ref.html
diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list
index 946d46841489..a6452aab971d 100644
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -138,8 +138,8 @@ random-if(B2G||Mulet) == really-big-background.html really-big-background-ref.ht
 
 HTTP == background-referrer.html background-referrer-ref.html
 
-== attachment-scroll-positioning-1.html attachment-scroll-positioning-1-ref.html
-== attachment-local-positioning-1.html attachment-local-positioning-1-ref.html
+skip-if(Mulet) == attachment-scroll-positioning-1.html attachment-scroll-positioning-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == attachment-local-positioning-1.html attachment-local-positioning-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == attachment-local-positioning-2.html attachment-local-positioning-2-ref.html
 == attachment-local-positioning-3.html attachment-local-positioning-3-ref.html
 == attachment-local-positioning-4.html attachment-local-positioning-4-ref.html
@@ -161,6 +161,6 @@ fails-if(Android&&AndroidVersion==15) fuzzy-if(winWidget||(Android&&AndroidVersi
 fails-if(Android&&AndroidVersion==15) fuzzy-if(!Android||(Android&&AndroidVersion!=15),80,500) == attachment-local-clipping-image-6.html attachment-local-clipping-image-6-ref.html #Bug 959165
 
 == background-multiple-with-border-radius.html background-multiple-with-border-radius-ref.html
-== background-repeat-large-area.html background-repeat-large-area-ref.html
+skip-if(Mulet) == background-repeat-large-area.html background-repeat-large-area-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 fuzzy(30,474) == background-tiling-zoom-1.html background-tiling-zoom-1-ref.html
diff --git a/layout/reftests/border-image/reftest.list b/layout/reftests/border-image/reftest.list
index 2b0e9f8dde9c..2dbc615ace3c 100644
--- a/layout/reftests/border-image/reftest.list
+++ b/layout/reftests/border-image/reftest.list
@@ -36,7 +36,7 @@ fails-if(Android||B2G) == center-scaling-3.html center-scaling-3-ref.html # Andr
 == border-image-outset-1c.html border-image-outset-1-ref.html
 == border-image-nofill-1.html border-image-nofill-1-ref.html
 == border-image-outset-resize-1.html border-image-outset-resize-1-ref.html
-== border-image-outset-move-1.html border-image-outset-move-1-ref.html
+skip-if(Mulet) == border-image-outset-move-1.html border-image-outset-move-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == border-image-style-none.html border-image-style-none-ref.html
 == border-image-style-none-length.html border-image-style-none-length-ref.html
 == border-image-style-none-auto.html border-image-style-none-auto-ref.html
diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index 9423bb918bd5..532b6f0a8953 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -39,26 +39,26 @@ fuzzy-if(winWidget&&!d2d,3,10) fuzzy-if(d2d,15,32) fuzzy-if(Android||B2G,3,15) =
 fails == clipping-1.html clipping-1-ref.html # background color should completely fill box; bug 466572
 != clipping-2.html about:blank # background color clipped to inner/outer border, can't get
 # great tests for this due to antialiasing problems described in bug 466572
-== clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background
+skip-if(Mulet) == clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # Tests for clipping the contents of replaced elements and overflow!=visible
 != clipping-4-ref.html clipping-4-notref.html
-fuzzy-if(true,1,20) fuzzy-if(cocoaWidget,1,180) fuzzy-if(Android&&browserIsRemote,7,169) fuzzy-if(Android&&!browserIsRemote,140,237) == clipping-4-canvas.html clipping-4-ref.html # bug 732535
+fuzzy-if(true,1,20) fuzzy-if(cocoaWidget,1,180) fuzzy-if(Android&&browserIsRemote,7,169) fuzzy-if(Android&&!browserIsRemote,140,237) skip-if(Mulet) == clipping-4-canvas.html clipping-4-ref.html # bug 732535 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(Android,5,54) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) == clipping-4-image.html clipping-4-ref.html
 fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) == clipping-4-overflow-hidden.html clipping-4-ref.html
 == clipping-5-canvas.html clipping-5-refc.html
 fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-5-image.html clipping-5-refi.html
 fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-5-overflow-hidden.html clipping-5-ref.html
 fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,5,21) == clipping-5-refi.html clipping-5-ref.html
-fuzzy-if(true,1,7) fuzzy-if(cocoaWidget,1,99) fuzzy-if(Android&&browserIsRemote,7,89) fuzzy-if(Android&&!browserIsRemote,99,115) == clipping-5-refc.html clipping-5-ref.html # bug 732535
-fuzzy-if(winWidget,105,71) fuzzy-if(Android,8,464) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical
-fuzzy-if(true,2,29) fuzzy-if(Android&&AndroidVersion<15,12,81) fuzzy-if(Android&&AndroidVersion>=15,255,586) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures).
+fuzzy-if(true,1,7) fuzzy-if(cocoaWidget,1,99) fuzzy-if(Android&&browserIsRemote,7,89) fuzzy-if(Android&&!browserIsRemote,99,115) skip-if(Mulet) == clipping-5-refc.html clipping-5-ref.html # bug 732535 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(winWidget,105,71) fuzzy-if(Android,8,464) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+fuzzy-if(true,2,29) fuzzy-if(Android&&AndroidVersion<15,12,81) fuzzy-if(Android&&AndroidVersion>=15,255,586) skip-if(Mulet) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures). # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-and-zindex-1.html clipping-and-zindex-1-ref.html
-fuzzy-if(cocoaWidget,1,4) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
+skip-if(Mulet) fuzzy-if(cocoaWidget,1,4) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == intersecting-clipping-1-image.html intersecting-clipping-1-refi.html
 == intersecting-clipping-1-overflow-hidden.html intersecting-clipping-1-ref.html
 fuzzy-if(Android,5,105) fuzzy-if(d2d,1,20) == intersecting-clipping-1-refi.html intersecting-clipping-1-ref.html
-fuzzy-if(true,1,33) fuzzy-if(cocoaWidget,1,332) fuzzy-if(Android&&browserIsRemote,7,310) fuzzy-if(Android&&!browserIsRemote,124,440) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html # bug 732535
+fuzzy-if(true,1,33) fuzzy-if(cocoaWidget,1,332) fuzzy-if(Android&&browserIsRemote,7,310) fuzzy-if(Android&&!browserIsRemote,124,440) skip-if(Mulet) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html # bug 732535 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # Inheritance
 == inherit-1.html inherit-1-ref.html # border-radius shouldn't inherit
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index fc2f9678e90e..bdd9756f6fae 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -82,8 +82,8 @@ fuzzy-if(gtk2Widget,6,26200) == 28811-2b.html 28811-2-ref.html  # Bug 1128229
 == 68061-2.xml 68061-2-ref.xml
 == 76331-1.html 76331-1-ref.html
 == 81947-1.html 81947-ref.html
-== 82711-1.html 82711-1-ref.html
-== 82711-2.html 82711-2-ref.html
+skip-if(Mulet) == 82711-1.html 82711-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 82711-2.html 82711-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 82711-3.html 82711-3-ref.html
 != 82711-1-ref.html 82711-2-ref.html
 != 82711-1-ref.html 82711-3-ref.html
@@ -251,24 +251,24 @@ skip-if(B2G||Mulet) == 243519-1.html 243519-1-ref.html # Initial mulet triage: p
 == 243519-2.html 243519-2-ref.html
 == 243519-3.html 243519-3-ref.html
 == 243519-4a.html 243519-4-ref.html
-== 243519-4b.html 243519-4-ref.html
+skip-if(Mulet) == 243519-4b.html 243519-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 243519-4c.html 243519-4-ref.html
-== 243519-4d.html 243519-4-ref.html
+skip-if(Mulet) == 243519-4d.html 243519-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 243519-4e.html 243519-4-ref.html
-== 243519-4f.html 243519-4-ref.html
+skip-if(Mulet) == 243519-4f.html 243519-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 243519-5a.html 243519-5-ref.html
 == 243519-5b.html 243519-5-ref.html
-== 243519-5c.html 243519-5-ref.html
-== 243519-5d.html 243519-5-ref.html
+skip-if(Mulet) == 243519-5c.html 243519-5-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-5d.html 243519-5-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 243519-6.html 243519-6-ref.html
 skip-if(B2G||Mulet) == 243519-7.html 243519-7-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-== 243519-8.svg 243519-8-ref.svg
-== 243519-9a.html 243519-9-ref.html
-== 243519-9b.html 243519-9-ref.html
-== 243519-9c.html 243519-9-ref.html
-== 243519-9d.html 243519-9-ref.html
-== 243519-9e.html 243519-9-ref.html
-== 243519-9f.html 243519-9-ref.html
+skip-if(Mulet) == 243519-8.svg 243519-8-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-9a.html 243519-9-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-9b.html 243519-9-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-9c.html 243519-9-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-9d.html 243519-9-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-9e.html 243519-9-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 243519-9f.html 243519-9-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 244135-1.html 244135-1-ref.html
 == 244135-2.html 244135-2-ref.html
 == 244932-1.html 244932-1-ref.html
@@ -472,7 +472,7 @@ skip-if((B2G&&browserIsRemote)||Mulet) == 348049-1.xhtml 348049-1-ref.xhtml # In
 == 348516-2.html 348516-2-ref.html
 != 348516-2.html 348516-2-notref.html
 != 348516-3.html 348516-3-notref.html
-== 348597-1.html 348597-ref.html
+skip-if(Mulet) == 348597-1.html 348597-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 348809-1a.html 348809-1-ref.html
 == 348809-1b.html 348809-1-ref.html
 == 348809-1c.html 348809-1-ref.html
@@ -908,12 +908,12 @@ fuzzy-if(Android&&AndroidVersion>=15,8,50) == 404553-1.html 404553-1-ref.html  #
 == 405380-1.html 405380-1-ref.html
 == 405517-1.xhtml 405517-1-ref.xhtml
 == 405577-1.html 405577-1-ref.html
-== 405584-1.html 405584-1-ref.html
+skip-if(Mulet) == 405584-1.html 405584-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 # == 405952-1.html 405952-1-ref.html
 == 406484-1.html 406484-1-ref.html
 == 406568-1.html 406568-1-ref.html
 == 407016-1-a.html 407016-1-ref.html
-== 407016-1-b.html 407016-1-ref.html
+skip-if(Mulet) == 407016-1-b.html 407016-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 407078-1.html 407078-1-ref.html
 == 407095-1.html 407095-1-ref.html
 fuzzy-if(Android,13,9) == 407111-1.html 407111-1-ref.html  # Bug 1128229
@@ -1135,7 +1135,7 @@ skip-if(B2G||Mulet) == 430412-1.html 430412-1-ref.html # Initial mulet triage: p
 == 431520-1.html 431520-1-ref.html
 == 431948-1.html 431948-1-ref.html
 == 433640-1.html 433640-1-ref.html
-== 433700.html 433700-ref.html
+skip-if(Mulet) == 433700.html 433700-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 436356-1.html 436356-1-ref.html
 == 436356-2.html 436356-2-ref.html
 == 438537-1.html 438537-1-ref.html
@@ -1219,11 +1219,11 @@ skip-if(B2G||Mulet) == 458296-1d.html 458296-1-ref.html # Initial mulet triage:
 == 458487-1h.html 458487-1-ref.html
 == 458487-2.html 458487-2-ref.html
 == 458487-3.html 458487-3-ref.html
-== 458487-4a.html 458487-4-ref.html
-== 458487-4b.html 458487-4-ref.html
-== 458487-4c.html 458487-4-ref.html
-== 458487-5a.html 458487-5-ref.html
-== 458487-5b.html 458487-5-ref.html
+skip-if(Mulet) == 458487-4a.html 458487-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 458487-4b.html 458487-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 458487-4c.html 458487-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 458487-5a.html 458487-5-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 458487-5b.html 458487-5-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 459443-1.html 459443-1-ref.html
 == 459613-1.html 459613-1-ref.html
 == 460012-1.html 460012-1-ref.html
@@ -1597,11 +1597,11 @@ skip-if(!asyncPanZoom) == 593243-1.html 593243-1-ref.html # bug 593168
 skip-if(!asyncPanZoom) == 593243-2.html 593243-2-ref.html # bug 593168
 == 593544-1.html 593544-1-ref.html
 random-if(Android) == 594333-1.html 594333-1-ref.html
-fuzzy-if(B2G,1,40000) == 594624-1.html 594624-1-ref.html
+skip-if(Mulet) fuzzy-if(B2G,1,40000) == 594624-1.html 594624-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 594737-1.html 594737-1-ref.html
 == 597721-1.html 597721-1-ref.html
 random-if(winWidget) fuzzy-if(B2G,3,40) fuzzy-if(Android,38,539) needs-focus == 598726-1.html 598726-1-ref.html # Fails on Windows, bug 782196
-== 599113-1.html 599113-1-ref.html
+skip-if(Mulet) == 599113-1.html 599113-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails-if(!haveTestPlugin) == 599476.html 599476-ref.html
 == 599882-1a.html 599882-1-ref.html
 == 599882-1b.html 599882-1-ref.html
@@ -1624,7 +1624,7 @@ fuzzy-if(Android&&AndroidVersion>=15,8,20) == 602200-3.html 602200-3-ref.html
 == 608756-1a.html 608756-1-ref.html
 == 608756-1b.html 608756-1-ref.html
 == 608756-2.html 608756-2-ref.html
-== 609272-1.html 609272-1-ref.html
+skip-if(Mulet) == 609272-1.html 609272-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 needs-focus == 613433-1.html 613433-1-ref.html
 needs-focus == 613433-1.html 613433-2-ref.html
 needs-focus == 613433-1.html 613433-3-ref.html
@@ -1637,7 +1637,7 @@ needs-focus == 613433-3.html 613433-3-ref.html
 == 614272-1.svg  614272-1-ref.svg
 HTTP(..) == 615121-1.html 615121-1-ref.html
 HTTP(..) != 615121-2.html 615121-2-notref.html
-fails-if(Android&&AndroidVersion!=10&&AndroidVersion!=17) == 617242-1.html 617242-1-ref.html
+skip-if(Mulet) fails-if(Android&&AndroidVersion!=10&&AndroidVersion!=17) == 617242-1.html 617242-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 != 618071.html 618071-notref.html
 == 619117-1.html 619117-1-ref.html
 HTTP(..) == 619511-1.html 619511-1-ref.html
@@ -1657,7 +1657,7 @@ skip-if(Android||B2G||Mulet) random-if(winWidget) == 632781-verybig.html 632781-
 == 632781-normalsize.html 632781-ref.html
 fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,559) == 633344-1.html 633344-1-ref.html # bug 1103623
 == 634232-1.html 634232-1-ref.html
-fails-if(Android&&AndroidVersion<17&&AndroidVersion!=10) == 635302-1.html 635302-1-ref.html
+skip-if(Mulet) fails-if(Android&&AndroidVersion<17&&AndroidVersion!=10) == 635302-1.html 635302-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy(1,68) skip-if(B2G||Mulet) fails-if(Android) == 635373-1.html 635373-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,61) == 635373-2.html 635373-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,1,60) == 635373-3.html 635373-3-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
@@ -1665,19 +1665,19 @@ HTTP(..) == 635639-1.html 635639-1-ref.html
 HTTP(..) == 635639-2.html 635639-2-ref.html
 random == 637597-1.html 637597-1-ref.html # bug 637597 was never really fixed!
 fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-1.html 637852-1-ref.html
-fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-2.html 637852-2-ref.html
+skip-if(Mulet) fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-2.html 637852-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(Android&&AndroidVersion>=15,8,500) == 637852-3.html 637852-3-ref.html
 skip-if(B2G||Mulet) == 641770-1.html 641770-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 == 641856-1.html 641856-1-ref.html
 == 645491-1.html 645491-1-ref.html
 == 645768-1.html 645768-1-ref.html
-fails-if(layersGPUAccelerated&&cocoaWidget) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) == 650228-1.html 650228-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
+skip-if(Mulet) fails-if(layersGPUAccelerated&&cocoaWidget) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) == 650228-1.html 650228-1-ref.html # Quartz alpha blending doesn't match GL alpha blending # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 needs-focus == 652301-1a.html 652301-1-ref.html
 needs-focus == 652301-1b.html 652301-1-ref.html
 == 652775-1.html 652775-1-ref.html
 == 653930-1.html 653930-1-ref.html
 HTTP(..) == 654057-1.html 654057-1-ref.html
-fails-if(layersGPUAccelerated&&cocoaWidget) fails-if(Android&&AndroidVersion!=17&&AndroidVersion!=10) == 654950-1.html 654950-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
+skip-if(Mulet) fails-if(layersGPUAccelerated&&cocoaWidget) fails-if(Android&&AndroidVersion!=17&&AndroidVersion!=10) == 654950-1.html 654950-1-ref.html # Quartz alpha blending doesn't match GL alpha blending # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 655549-1.html 655549-1-ref.html
 == 655836-1.html 655836-1-ref.html
 != 656875.html about:blank
@@ -1708,7 +1708,7 @@ needs-focus != 703186-1.html 703186-2.html
 == 714519-1-q.html 714519-1-ref.html
 == 714519-2-as.html 714519-2-ref.html
 == 714519-2-q.html 714519-2-ref.html
-skip-if(B2G||Mulet) fuzzy-if(true,1,21) fuzzy-if(cocoaWidget,1,170) fuzzy-if(Android&&browserIsRemote,7,157) fails-if(Android&&!browserIsRemote&&AndroidVersion!=17&&AndroidVersion!=10) == 718521.html 718521-ref.html # bug 760270 # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
+fuzzy-if(true,1,21) fuzzy-if(cocoaWidget,1,170) fuzzy-if(Android&&browserIsRemote,7,157) fails-if(Android&&!browserIsRemote&&AndroidVersion!=17&&AndroidVersion!=10) skip-if(B2G||Mulet) == 718521.html 718521-ref.html # bug 760270 # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 720987.html 720987-ref.html
 == 722888-1.html 722888-1-ref.html
 == 722923-1.html 722923-1-ref.html
@@ -1746,7 +1746,7 @@ fuzzy(40,850) fuzzy-if(azureQuartz,73,542) == 797797-1.html 797797-1-ref.html #
 fuzzy(40,850) fuzzy-if(azureQuartz,68,586) == 797797-2.html 797797-2-ref.html # 'opacity:N' and rgba(,,,N) text don't match precisely
 == 801994-1.html 801994-1-ref.html
 == 804323-1.html 804323-1-ref.html
-fuzzy-if(Android,8,608) == 811301-1.html 811301-1-ref.html
+skip-if(Mulet) fuzzy-if(Android,8,608) == 811301-1.html 811301-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 812824-1.html 812824-1-ref.html
 == 814677.html 814677-ref.html
 skip-if(B2G||Mulet) == 814952-1.html 814952-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
@@ -1761,9 +1761,9 @@ skip-if(B2G||Mulet) == 818276-1.html 818276-1-ref.html # Initial mulet triage: p
 == 827577-1b.html 827577-1-ref.html
 == 827799-1.html about:blank
 == 829958.html 829958-ref.html
-== 836844-1.html 836844-1-ref.html
+skip-if(Mulet) == 836844-1.html 836844-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 841192-1.html 841192-1-ref.html
-== 844178.html 844178-ref.html
+skip-if(Mulet) == 844178.html 844178-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(OSX,1,364) == 846144-1.html 846144-1-ref.html
 == 847850-1.html 847850-1-ref.html
 == 848421-1.html 848421-1-ref.html
@@ -1785,7 +1785,7 @@ skip-if((B2G&&browserIsRemote)||Mulet) == 858803-1.html 858803-1-ref.html # bug
 == 897491-1.html 897491-1-ref.html
 == 897491-2.html 897491-2-ref.html
 fuzzy(2,10000) fuzzy-if(Android&&AndroidVersion>=15,5,10000) == 902330-1.html 902330-1-ref.html
-fuzzy-if(Android,8,400) == 906199-1.html 906199-1-ref.html
+skip-if(Mulet) fuzzy-if(Android,8,400) == 906199-1.html 906199-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 921716-1.html 921716-1-ref.html
 test-pref(layout.css.sticky.enabled,true) == 926155-1.html 926155-1-ref.html
 fuzzy-if(cocoaWidget,1,40) == 928607-1.html 928607-1-ref.html
@@ -1803,10 +1803,10 @@ fuzzy-if(B2G,1,7) == 942672-1.html 942672-1-ref.html
 == 950436-1.html 950436-1-ref.html
 == 957770-1.svg 957770-1-ref.svg
 == 960277-1.html 960277-1-ref.html
-== 961887-1.html 961887-1-ref.html
-== 961887-2.html 961887-2-ref.html
+skip-if(Mulet) == 961887-1.html 961887-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 961887-2.html 961887-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 961887-3.html 961887-3-ref.html
-pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) == 966992-1.html 966992-1-ref.html
+pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) skip-if(Mulet) == 966992-1.html 966992-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(Android) == 966510-1.html 966510-1-ref.html # scrollable elements other than the root probably won't work well on android until bug 776030 is fixed
 skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above
 == 978911-1.svg 978911-1-ref.svg
@@ -1833,8 +1833,8 @@ pref(layout.css.will-change.enabled,true) == 1018522-1.html 1018522-1-ref.html
 pref(browser.display.use_document_fonts,0) == 1022481-1.html 1022481-1-ref.html
 == 1022612-1.html 1022612-1-ref.html
 == 1024473-1.html 1024473-1-ref.html
-== 1025914-1.html 1025914-1-ref.html
-== 1042104-1.html 1042104-1-ref.html
+skip-if(Mulet) == 1025914-1.html 1025914-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 1042104-1.html 1042104-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 1044198-1.html 1044198-1-ref.html
 == 1049499-1.html 1049499-1-ref.html
 == 1050493-1.html 1050493-1-ref.html
@@ -1846,7 +1846,7 @@ test-pref(layout.css.grid.enabled,true) == 1053035-1-grid.html 1053035-1-ref.htm
 == 1059498-2.html 1059498-1-ref.html
 == 1059498-3.html 1059498-1-ref.html
 skip-if(Mulet) == 1062108-1.html 1062108-1-ref.html # Bug 1139893: font rounding failure, tracked in bug 1141535
-fails-if(Android) fuzzy-if(Mulet,1,5) == 1062792-1.html 1062792-1-ref.html
+fails-if(Android) fuzzy-if(Mulet,1,5) skip-if(Mulet) == 1062792-1.html 1062792-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 1062963-floatmanager-reflow.html 1062963-floatmanager-reflow-ref.html
 test-pref(dom.webcomponents.enabled,true) == 1066554-1.html 1066554-1-ref.html
 == 1069716-1.html 1069716-1-ref.html
@@ -1860,8 +1860,8 @@ fuzzy-if(d2d,36,304) HTTP(..) == 1116480-1-fakeitalic-overflow.html 1116480-1-fa
 == 1111753-1.html about:blank
 == 1119117-1a.html 1119117-1-ref.html
 == 1119117-1b.html 1119117-1-ref.html
-== 1120431-1.html 1120431-1-ref.html
-== 1120431-2.html 1120431-2-ref.html
+skip-if(Mulet) == 1120431-1.html 1120431-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 1120431-2.html 1120431-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 1121748-1.html 1121748-1-ref.html
 == 1121748-2.html 1121748-2-ref.html
 == 1127107-1a-nowrap.html 1127107-1-ref.html
diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list
index 9276a8840f6b..c7570c110f1b 100644
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -3,7 +3,7 @@ skip-if(B2G||Mulet) fuzzy-if(Android&&AndroidVersion>=15,8,1000) == size-1.html
 
 == empty-transaction-1.html empty-transaction-1-ref.html
 
-== image-rendering-test.html image-rendering-ref.html
+skip-if(Mulet) == image-rendering-test.html image-rendering-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == image-shadow.html image-shadow-ref.html
 
 skip-if(B2G||Mulet) asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
@@ -79,7 +79,7 @@ random-if(azureSkiaGL) == evenodd-fill-2.html evenodd-fill-ref.html
 == evenodd-fill-3.html nonzero-fill-2.html
 
 == dash-sanity.html data:text/html,<body>Pass
-fuzzy-if(azureSkia,9,470) random-if(Android) == dash-1.html dash-1-ref.svg  # Bug 668412 (really is android-specific, not IPC-specific)
+skip-if(Mulet) fuzzy-if(azureSkia,9,470) random-if(Android) == dash-1.html dash-1-ref.svg  # Bug 668412 (really is android-specific, not IPC-specific) # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 == ctm-sanity.html data:text/html,<body>Pass
 == ctm-singular-sanity.html data:text/html,<body>Pass
@@ -90,7 +90,7 @@ fails-if(OSX==1006) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gra
 
 != 693610-1.html 693610-1-notref.html # bug 693610: multiple glyph runs should not be overprinted
 
-== 726951-shadow-clips.html 726951-shadow-clips-ref.html
+skip-if(Mulet) == 726951-shadow-clips.html 726951-shadow-clips-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 == transformed-clip.html transformed-clip-ref.html
 == transformed-gradient.html transformed-gradient-ref.html
diff --git a/layout/reftests/css-blending/reftest.list b/layout/reftests/css-blending/reftest.list
index 536716d8a53a..d41264785281 100644
--- a/layout/reftests/css-blending/reftest.list
+++ b/layout/reftests/css-blending/reftest.list
@@ -1,7 +1,7 @@
-pref(layout.css.mix-blend-mode.enabled,true) == blend-canvas.html blend-canvas-ref.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-constant-background-color.html blend-constant-background-color-ref.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-gradient-background-color.html blend-gradient-background-color-ref.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-image.html blend-image-ref.html
+skip-if(Mulet) pref(layout.css.mix-blend-mode.enabled,true) == blend-canvas.html blend-canvas-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) pref(layout.css.mix-blend-mode.enabled,true) == blend-constant-background-color.html blend-constant-background-color-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) pref(layout.css.mix-blend-mode.enabled,true) == blend-gradient-background-color.html blend-gradient-background-color-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) pref(layout.css.mix-blend-mode.enabled,true) == blend-image.html blend-image-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking-ref.html
 
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-alpha.html background-blending-alpha-ref.html
@@ -40,8 +40,8 @@ fuzzy-if(azureQuartz,2,40000) fuzzy-if(azureSkia||d2d||gtk2Widget,1,40000) pref(
 #fuzzy due to inconsistencies in rounded rect cliping between parent and child; may be related to antialiasing. Between platforms, the max difference is the same, and the number of different pixels is either 36 or 37. (Win, Mac and Lin)
 fuzzy(64,37) pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-952051.html mix-blend-mode-952051-ref.html
 
-pref(layout.css.mix-blend-mode.enabled,true) pref(layout.css.filters.enabled,true) == mix-blend-mode-and-filter.html mix-blend-mode-and-filter-ref.html
-pref(layout.css.mix-blend-mode.enabled,true) pref(layout.css.filters.enabled,true) == mix-blend-mode-and-filter.svg mix-blend-mode-and-filter-ref.svg
+skip-if(Mulet) pref(layout.css.mix-blend-mode.enabled,true) pref(layout.css.filters.enabled,true) == mix-blend-mode-and-filter.html mix-blend-mode-and-filter-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) pref(layout.css.mix-blend-mode.enabled,true) pref(layout.css.filters.enabled,true) == mix-blend-mode-and-filter.svg mix-blend-mode-and-filter-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-child-of-blended-has-opacity.html mix-blend-mode-child-of-blended-has-opacity-ref.html
 
@@ -52,7 +52,7 @@ pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-nested-976533.htm
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-svg-as-data-uri.html background-blending-image-color-ref.html
 # Test 10
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-gif.html background-blending-image-color-gif-ref.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-transform3d.html background-blending-image-color-ref.html
+skip-if(Mulet) pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-transform3d.html background-blending-image-color-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # Test plan 5.3.2 Background layers do not blend with content outside the background (or behind the element) - tests 2 and 3
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-isolation-parent-child-color.html background-blending-isolation-parent-child-ref.html
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
index 6115c5456bbe..92eac63d2262 100644
--- a/layout/reftests/css-gradients/reftest.list
+++ b/layout/reftests/css-gradients/reftest.list
@@ -1,9 +1,9 @@
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,3,89700) fuzzy-if(azureQuartz,1,18) fuzzy-if(azureQuartz,1,34792) == linear-1a.html linear-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,3,89700) fuzzy-if(azureQuartz,1,18) fuzzy-if(azureQuartz,1,34792) == linear-1b.html linear-1-ref.html
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,3,89700) fuzzy-if(azureQuartz,1,18) fuzzy-if(azureQuartz,1,34792) == linear-1a.html linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,3,89700) fuzzy-if(azureQuartz,1,18) fuzzy-if(azureQuartz,1,34792) == linear-1b.html linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(azureQuartz,1,11469) == linear-keywords-1a.html linear-keywords-1-ref.html
 fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(azureQuartz,1,11985) == linear-keywords-1b.html linear-keywords-1-ref.html
 fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureQuartz,1,10230) == linear-percent.html linear-percent-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,4,92400) fuzzy-if(azureSkiaGL,2,143400) fuzzy-if(azureQuartz,1,27827) fuzzy-if(Android&&AndroidVersion>=15,4,93000) == linear-mix.html linear-mix-ref.html
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,4,92400) fuzzy-if(azureSkiaGL,2,143400) fuzzy-if(azureQuartz,1,27827) fuzzy-if(Android&&AndroidVersion>=15,4,93000) == linear-mix.html linear-mix-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == linear-diagonal-1a.html linear-diagonal-1-ref.html
 == linear-diagonal-1b.html linear-diagonal-1-ref.html
 == linear-diagonal-1c.html linear-diagonal-1-ref.html
@@ -36,7 +36,7 @@ fails-if(d2d) == linear-repeat-1b.html linear-repeat-1-ref.html # bug 582236
 fails-if(d2d) == linear-repeat-1d.html linear-repeat-1-ref.html # bug 582236
 == linear-repeat-1e.html linear-repeat-1-ref.html
 fails-if(d2d) == linear-repeat-1f.html linear-repeat-1-ref.html # bug 582236
-fails-if(d2d) == linear-repeat-1g.html linear-repeat-1-ref.html # bug 582236
+skip-if(Mulet) fails-if(d2d) == linear-repeat-1g.html linear-repeat-1-ref.html # bug 582236 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == linear-rotated-1.html linear-rotated-1-ref.html
 == linear-size-1a.html linear-size-1-ref.html
 == linear-stops-1a.html linear-stops-1-ref.html
@@ -51,15 +51,15 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,1,88500) fuzzy-if(azureSkiaGL,2,89700) f
 fuzzy-if(!contentSameGfxBackendAsCanvas,1,88500) fuzzy-if(azureSkiaGL,2,89700) fuzzy-if(azureQuartz,2,26777) == linear-vertical-1d.html linear-vertical-1-ref.html
 fuzzy-if(!contentSameGfxBackendAsCanvas,1,88500) fuzzy-if(azureSkiaGL,2,89700) fuzzy-if(azureQuartz,1,22367) == linear-vertical-1e.html linear-vertical-1-ref.html
 == linear-vertical-subpixel-1.html linear-vertical-subpixel-1-ref.html
-== linear-viewport.html linear-viewport-ref.html
+skip-if(Mulet) == linear-viewport.html linear-viewport-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails-if(OSX==1010) == linear-zero-length-1a.html linear-zero-length-1-ref.html
 fails-if(OSX==1010) == linear-zero-length-1b.html linear-zero-length-1-ref.html
 fails-if(OSX==1010) == linear-zero-length-1c.html linear-zero-length-1-ref.html
 == nostops.html about:blank
 == onestop.html about:blank
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,2,88024) random-if(d2d) == radial-1a.html radial-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,2,88024) random-if(d2d) == radial-1b.html radial-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,2,88024) random-if(d2d) == radial-1c.html radial-1-ref.html
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,2,88024) random-if(d2d) == radial-1a.html radial-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,2,88024) random-if(d2d) == radial-1b.html radial-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,2,88024) random-if(d2d) == radial-1c.html radial-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy(3,7860) fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,2,90000) == radial-2a.html radial-2-ref.html
 fuzzy(3,7860) fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,2,90000) == radial-2b.html radial-2-ref.html
 fuzzy(3,7860) fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,2,90000) == radial-2c.html radial-2-ref.html
@@ -114,23 +114,23 @@ fuzzy-if(d2d,127,2612) == repeating-radial-1e.html repeating-radial-1-ref.html
 == twostops-1g.html twostops-1-ref.html
 
 # from http://www.xanthir.com/:4bhipd by way of http://a-ja.net/newgrad.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1a.html aja-linear-1-ref.html
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1a.html aja-linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails-if(!d2d&&!(OSX==1010&&isDebugBuild)) == aja-linear-1b.html aja-linear-1-ref.html # bug 526694, passing on 10.10 debug is bug 1128517
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1c.html aja-linear-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1d.html aja-linear-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1e.html aja-linear-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1f.html aja-linear-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1g.html aja-linear-1-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2a.html aja-linear-2-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2b.html aja-linear-2-ref.html
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1c.html aja-linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1d.html aja-linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1e.html aja-linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1f.html aja-linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1g.html aja-linear-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2a.html aja-linear-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2b.html aja-linear-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails == aja-linear-2c.html aja-linear-2-ref.html # bug 522607
 fails-if(!d2d) == aja-linear-2d.html aja-linear-2-ref.html # bug 526694
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,19999) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3a.html aja-linear-3-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,1,19999) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3b.html aja-linear-3-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4a.html aja-linear-4-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4b.html aja-linear-4-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,19999) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3a.html aja-linear-3-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,1,19999) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3b.html aja-linear-3-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4a.html aja-linear-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4b.html aja-linear-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(!contentSameGfxBackendAsCanvas,2,16477) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607
 skip-if(B2G||Mulet) == height-dependence-1.html height-dependence-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,1,40000) == height-dependence-2.html height-dependence-2-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/first-line/reftest.list b/layout/reftests/first-line/reftest.list
index 9e0cca7081d6..2529984a31ff 100644
--- a/layout/reftests/first-line/reftest.list
+++ b/layout/reftests/first-line/reftest.list
@@ -34,4 +34,4 @@ load stress-10.html # crash test
 
 == restyle-inside-first-line.html restyle-inside-first-line-ref.html
 == font-styles.html font-styles-ref.html
-== font-styles-nooverflow.html font-styles-ref.html
+skip-if(Mulet) == font-styles-nooverflow.html font-styles-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/font-features/reftest.list b/layout/reftests/font-features/reftest.list
index a67de6da3fa5..6a1310134baf 100644
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -59,12 +59,12 @@ HTTP(..) == annotations.html annotations-ref.html
 # font-variant subproperties
 # test for specific features being on and others off, based on prop values
 # (debug problems with font-variant-debug.html which displays all props)
-HTTP(..) == font-variant-alternates.html font-variant-alternates-ref.html
-HTTP(..) == font-variant-caps.html font-variant-caps-ref.html
-HTTP(..) == font-variant-east-asian.html font-variant-east-asian-ref.html
-HTTP(..) == font-variant-ligatures.html font-variant-ligatures-ref.html
-HTTP(..) == font-variant-numeric.html font-variant-numeric-ref.html
-HTTP(..) == font-variant-position.html font-variant-position-ref.html
+skip-if(Mulet) HTTP(..) == font-variant-alternates.html font-variant-alternates-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) HTTP(..) == font-variant-caps.html font-variant-caps-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) HTTP(..) == font-variant-east-asian.html font-variant-east-asian-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) HTTP(..) == font-variant-ligatures.html font-variant-ligatures-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) HTTP(..) == font-variant-numeric.html font-variant-numeric-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) HTTP(..) == font-variant-position.html font-variant-position-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # font-kerning
 HTTP(..) != font-kerning-normal.html font-kerning-none.html
diff --git a/layout/reftests/font-matching/reftest.list b/layout/reftests/font-matching/reftest.list
index 3b2327cbfbe2..fd9c5a0fc92a 100644
--- a/layout/reftests/font-matching/reftest.list
+++ b/layout/reftests/font-matching/reftest.list
@@ -45,7 +45,7 @@ random-if(cocoaWidget) != impact-bold.html impact.html # bug 539418
 
 # localized font family names should always match just as English names do
 == localized-family-names-001.html localized-family-names-001-ref.html
-== localized-family-names-002.html localized-family-names-002-ref.html
+skip-if(Mulet) == localized-family-names-002.html localized-family-names-002-ref.html # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == localized-family-names-003.html localized-family-names-003-ref.html
 == localized-family-names-004.html localized-family-names-004-ref.html
 
@@ -92,7 +92,7 @@ random-if(!(cocoaWidget||winWidget)) == arial-arabic.html arial-arabic-ref.html
 != syntheticbold-rotated.html syntheticbold-rotated-ref.html
 
 HTTP(..) == font-synthesis-1.html font-synthesis-1-ref.html
-HTTP(..) == font-synthesis-2.html font-synthesis-2-ref.html
+skip-if(Mulet) HTTP(..) == font-synthesis-2.html font-synthesis-2-ref.html # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # Bug 1060791 - support for format 10 cmap in Apple Symbols;
 # relevant fonts not present on other platforms.
diff --git a/layout/reftests/forms/fieldset/reftest.list b/layout/reftests/forms/fieldset/reftest.list
index 030dd8c7b6f9..7dd79f2ea41b 100644
--- a/layout/reftests/forms/fieldset/reftest.list
+++ b/layout/reftests/forms/fieldset/reftest.list
@@ -5,7 +5,7 @@
 == fieldset-scroll-1.html fieldset-scroll-1-ref.html
 == fieldset-scrolled-1.html fieldset-scrolled-1-ref.html
 random-if(B2G||Mulet) == fieldset-overflow-auto-1.html fieldset-overflow-auto-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget&&!layersGPUAccelerated,102,205) == positioned-container-1.html positioned-container-1-ref.html
+skip-if(Mulet) fuzzy-if(winWidget&&!layersGPUAccelerated,102,205) == positioned-container-1.html positioned-container-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == relpos-legend-1.html relpos-legend-1-ref.html
 == relpos-legend-2.html relpos-legend-2-ref.html
 test-pref(layout.css.sticky.enabled,true) skip-if((B2G&&browserIsRemote)||Mulet) == sticky-legend-1.html sticky-legend-1-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list
index f568cd424ac5..606d00955fe1 100644
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,8,30) == background-image-zoom-1.html background-image-zoom-1-ref.html
+skip-if(Mulet) fuzzy-if(Android,8,30) == background-image-zoom-1.html background-image-zoom-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == background-image-zoom-2.html about:blank
 == image-seam-1a.html image-seam-1-ref.html
 == image-seam-1b.html image-seam-1-ref.html
diff --git a/layout/reftests/line-breaking/reftest.list b/layout/reftests/line-breaking/reftest.list
index e531cf05f4f4..6ec955ffb857 100644
--- a/layout/reftests/line-breaking/reftest.list
+++ b/layout/reftests/line-breaking/reftest.list
@@ -32,4 +32,4 @@ skip-if(B2G||Mulet) skip-if(gtk2Widget) == quotationmarks-cjk-1.html quotationma
 == url-2.html url-2-ref.html
 == url-3.html url-3-ref.html
 == winpath-1.html winpath-1-ref.html
-== zwnbsp-1.html zwnbsp-1-ref.html
+skip-if(Mulet) == zwnbsp-1.html zwnbsp-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/marquee/reftest.list b/layout/reftests/marquee/reftest.list
index da1d2f118b9a..30d1bef69354 100644
--- a/layout/reftests/marquee/reftest.list
+++ b/layout/reftests/marquee/reftest.list
@@ -3,7 +3,7 @@ fuzzy-if(Android&&AndroidVersion>=15,8,50) == 336736-1a.html 336736-1-ref.html
 fuzzy-if(Android&&AndroidVersion>=15,8,50) == 336736-1b.html 336736-1-ref.html
 == 406073-1.html 406073-1-ref.html
 == 407016-2.html 407016-2-ref.html
-fuzzy-if(Android&&AndroidVersion>=15,8,220) == 413027-4.html 413027-4-ref.html
-fuzzy-if(Android&&AndroidVersion>=15,8,30) == 425247-1.html 425247-1-ref.html
+skip-if(Mulet) fuzzy-if(Android&&AndroidVersion>=15,8,220) == 413027-4.html 413027-4-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(Android&&AndroidVersion>=15,8,30) == 425247-1.html 425247-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(Android&&AndroidVersion>=15,8,30) == 425247-2.html 425247-2-ref.html
 random == 429849-1.html 429849-1-ref.html # bug 432288
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index 775b1bcdcf54..580fcbbc99f2 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -40,7 +40,7 @@ skip-if((B2G&&browserIsRemote)||Mulet) random-if(smallScreen&&Android) fuzzy(255
 == mfenced-9.html mfenced-9-ref.html
 fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == mfenced-10.html mfenced-10-ref.html # Windows versions without Cambria Math, see bug 670592
 fails-if(winWidget&&d2d) == mfenced-11.html mfenced-11-ref.html
-== mfenced-12.html mfenced-12-ref.html
+skip-if(Mulet) == mfenced-12.html mfenced-12-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == mi-mathvariant-1.xhtml mi-mathvariant-1-ref.xhtml
 == mi-mathvariant-2.xhtml mi-mathvariant-2-ref.xhtml
 != mi-mathvariant-3.html mi-mathvariant-3-ref.html
@@ -139,7 +139,7 @@ random-if(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu)) == semantics-1.
 == mpadded-5.html mpadded-5-ref.html
 == mpadded-1-2.html mpadded-1-2-ref.html
 == mpadded-6.html mpadded-6-ref.html
-fails-if(B2G) == mpadded-7.html mpadded-7-ref.html # B2G: slight character width variation
+skip-if(Mulet) fails-if(B2G) == mpadded-7.html mpadded-7-ref.html # B2G: slight character width variation # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails-if(B2G) == mpadded-8.html mpadded-8-ref.html # B2G: slight character width variation
 fails-if(B2G) == mpadded-9.html mpadded-9-ref.html # B2G: slight character width variation
 == math-display.html math-display-ref.html
diff --git a/layout/reftests/object/reftest.list b/layout/reftests/object/reftest.list
index 62ec41dd2848..15bcee3c8169 100644
--- a/layout/reftests/object/reftest.list
+++ b/layout/reftests/object/reftest.list
@@ -29,7 +29,7 @@ HTTP == type-overridden-by-server.html type-overridden-by-server-ref.html
 #
 == unknown-type.html unknown-type-ref.html
 == malformed-xml.html malformed-xml-ref.html
-== malformed-xml-with-type.html malformed-xml-with-type-ref.html
+skip-if(Mulet) == malformed-xml-with-type.html malformed-xml-with-type-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 #
 # XXX missing tests 025-28 from http://biesi.damowmow.com/object/ here; would
 #     need to require Flash on the test machine to run them
diff --git a/layout/reftests/outline/reftest.list b/layout/reftests/outline/reftest.list
index aa65512f959f..bb1686062872 100644
--- a/layout/reftests/outline/reftest.list
+++ b/layout/reftests/outline/reftest.list
@@ -1,7 +1,7 @@
 == outline-and-box-shadow.html outline-and-box-shadow-ref.html
 == outline-and-3d-transform-1a.html outline-and-3d-transform-1-ref.html
 == outline-and-3d-transform-1b.html outline-and-3d-transform-1-ref.html
-fuzzy-if(d2d,16,96) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html
+skip-if(Mulet) fuzzy-if(d2d,16,96) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == outline-overflow-block-abspos.html outline-overflow-block-ref.html
 == outline-overflow-block-float.html outline-overflow-block-ref.html
 == outline-overflow-inlineblock-abspos.html outline-overflow-inlineblock-ref.html
diff --git a/layout/reftests/pagination/reftest.list b/layout/reftests/pagination/reftest.list
index 1472111c25e4..9f6cc12e8736 100644
--- a/layout/reftests/pagination/reftest.list
+++ b/layout/reftests/pagination/reftest.list
@@ -43,7 +43,7 @@ fails == float-clear-003.html float-clear-000.ref.html
 == float-clear-003-print.html float-clear-000-print.ref.html
 fails == float-continuations-000.html float-continuations-000.ref.html
 == resize-reflow-000.html resize-reflow-000.ref.html
-== resize-reflow-001.html resize-reflow-001.ref.html
+skip-if(Mulet) == resize-reflow-001.html resize-reflow-001.ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == table-page-break-before-auto-1.html table-page-break-before-auto-1-ref.html
 #== table-page-break-before-auto-2.html table-page-break-before-auto-2-ref.html bug 563280
 == table-page-break-before-always-1.html table-page-break-before-auto-2-ref.html
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos.list
index adbd660da348..e31ad1b1ea0d 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos.list
@@ -1,25 +1,25 @@
 # Please see the comment at the beginning of reftest.list
-== leftN-widthA-rightA.html?border_abspos leftN-widthA-rightA-ref.html?border_abspos
-== leftN-widthA-rightA-2.html?border_abspos leftN-widthA-rightA-2-ref.html?border_abspos
-== leftN-widthA-rightN.html?border_abspos leftN-widthA-rightN-ref.html?border_abspos
-== leftN-widthA-rightN-2.html?border_abspos leftN-widthA-rightN-2-ref.html?border_abspos
+skip-if(Mulet) == leftN-widthA-rightA.html?border_abspos leftN-widthA-rightA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html?border_abspos leftN-widthA-rightA-2-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html?border_abspos leftN-widthA-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html?border_abspos leftN-widthA-rightN-2-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html?border_abspos leftA-widthN-rightA-ref.html?border_abspos
-== leftN-widthN-rightA.html?border_abspos leftN-widthN-rightA-ref.html?border_abspos
-== leftA-widthN-rightN.html?border_abspos leftA-widthN-rightN-ref.html?border_abspos
-== leftA-widthA-rightN.html?border_abspos leftA-widthA-rightN-ref.html?border_abspos
-== toauto-leftN-widthA-rightA.html?border_abspos toauto-leftN-widthA-rightA-ref.html?border_abspos
-== toauto-leftN-widthA-rightA-2.html?border_abspos toauto-leftN-widthA-rightA-2-ref.html?border_abspos
-== toauto-leftN-widthA-rightN.html?border_abspos toauto-leftN-widthA-rightN-ref.html?border_abspos
-== toauto-leftN-widthA-rightN-2.html?border_abspos toauto-leftN-widthA-rightN-2-ref.html?border_abspos
+skip-if(Mulet) == leftN-widthN-rightA.html?border_abspos leftN-widthN-rightA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html?border_abspos leftA-widthN-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html?border_abspos leftA-widthA-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html?border_abspos toauto-leftN-widthA-rightA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html?border_abspos toauto-leftN-widthA-rightA-2-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html?border_abspos toauto-leftN-widthA-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html?border_abspos toauto-leftN-widthA-rightN-2-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html?border_abspos toauto-leftA-widthN-rightA-ref.html?border_abspos
-== toauto-leftN-widthN-rightA.html?border_abspos toauto-leftN-widthN-rightA-ref.html?border_abspos
-== toauto-leftA-widthN-rightN.html?border_abspos toauto-leftA-widthN-rightN-ref.html?border_abspos
-== toauto-leftA-widthA-rightN.html?border_abspos toauto-leftA-widthA-rightN-ref.html?border_abspos
-== fromauto-leftN-widthA-rightA.html?border_abspos leftN-widthA-rightA-ref.html?border_abspos
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html?border_abspos toauto-leftN-widthN-rightA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html?border_abspos toauto-leftA-widthN-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html?border_abspos toauto-leftA-widthA-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html?border_abspos leftN-widthA-rightA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?border_abspos leftN-widthA-rightA-2-ref.html?border_abspos # Bug 688545
-== fromauto-leftN-widthA-rightN.html?border_abspos leftN-widthA-rightN-ref.html?border_abspos
-== fromauto-leftN-widthA-rightN-2.html?border_abspos leftN-widthA-rightN-2-ref.html?border_abspos
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html?border_abspos leftN-widthA-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html?border_abspos leftN-widthA-rightN-2-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html?border_abspos leftA-widthN-rightA-ref.html?border_abspos
-== fromauto-leftN-widthN-rightA.html?border_abspos leftN-widthN-rightA-ref.html?border_abspos
-== fromauto-leftA-widthN-rightN.html?border_abspos leftA-widthN-rightN-ref.html?border_abspos
-== fromauto-leftA-widthA-rightN.html?border_abspos leftA-widthA-rightN-ref.html?border_abspos
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html?border_abspos leftN-widthN-rightA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html?border_abspos leftA-widthN-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html?border_abspos leftA-widthA-rightN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent.list
index 3de9d1a7c8cb..645de32276b1 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent.list
@@ -1,26 +1,26 @@
 # Please see the comment at the beginning of reftest.list
 
-== leftN-widthA-rightA.html?border_parent leftN-widthA-rightA-ref.html?border_parent
-== leftN-widthA-rightA-2.html?border_parent leftN-widthA-rightA-2-ref.html?border_parent
-== leftN-widthA-rightN.html?border_parent leftN-widthA-rightN-ref.html?border_parent
-== leftN-widthA-rightN-2.html?border_parent leftN-widthA-rightN-2-ref.html?border_parent
+skip-if(Mulet) == leftN-widthA-rightA.html?border_parent leftN-widthA-rightA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html?border_parent leftN-widthA-rightA-2-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html?border_parent leftN-widthA-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html?border_parent leftN-widthA-rightN-2-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html?border_parent leftA-widthN-rightA-ref.html?border_parent
-== leftN-widthN-rightA.html?border_parent leftN-widthN-rightA-ref.html?border_parent
-== leftA-widthN-rightN.html?border_parent leftA-widthN-rightN-ref.html?border_parent
-== leftA-widthA-rightN.html?border_parent leftA-widthA-rightN-ref.html?border_parent
-== toauto-leftN-widthA-rightA.html?border_parent toauto-leftN-widthA-rightA-ref.html?border_parent
-== toauto-leftN-widthA-rightA-2.html?border_parent toauto-leftN-widthA-rightA-2-ref.html?border_parent
-== toauto-leftN-widthA-rightN.html?border_parent toauto-leftN-widthA-rightN-ref.html?border_parent
-== toauto-leftN-widthA-rightN-2.html?border_parent toauto-leftN-widthA-rightN-2-ref.html?border_parent
+skip-if(Mulet) == leftN-widthN-rightA.html?border_parent leftN-widthN-rightA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html?border_parent leftA-widthN-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html?border_parent leftA-widthA-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html?border_parent toauto-leftN-widthA-rightA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html?border_parent toauto-leftN-widthA-rightA-2-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html?border_parent toauto-leftN-widthA-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html?border_parent toauto-leftN-widthA-rightN-2-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html?border_parent toauto-leftA-widthN-rightA-ref.html?border_parent
-== toauto-leftN-widthN-rightA.html?border_parent toauto-leftN-widthN-rightA-ref.html?border_parent
-== toauto-leftA-widthN-rightN.html?border_parent toauto-leftA-widthN-rightN-ref.html?border_parent
-== toauto-leftA-widthA-rightN.html?border_parent toauto-leftA-widthA-rightN-ref.html?border_parent
-== fromauto-leftN-widthA-rightA.html?border_parent leftN-widthA-rightA-ref.html?border_parent
-random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?border_parent leftN-widthA-rightA-2-ref.html?border_parent # Bug 688545
-== fromauto-leftN-widthA-rightN.html?border_parent leftN-widthA-rightN-ref.html?border_parent
-== fromauto-leftN-widthA-rightN-2.html?border_parent leftN-widthA-rightN-2-ref.html?border_parent
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html?border_parent toauto-leftN-widthN-rightA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html?border_parent toauto-leftA-widthN-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html?border_parent toauto-leftA-widthA-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html?border_parent leftN-widthA-rightA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?border_parent leftN-widthA-rightA-2-ref.html?border_parent # Bug 688545 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html?border_parent leftN-widthA-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html?border_parent leftN-widthA-rightN-2-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html?border_parent leftA-widthN-rightA-ref.html?border_parent
-== fromauto-leftN-widthN-rightA.html?border_parent leftN-widthN-rightA-ref.html?border_parent
-== fromauto-leftA-widthN-rightN.html?border_parent leftA-widthN-rightN-ref.html?border_parent
-== fromauto-leftA-widthA-rightN.html?border_parent leftA-widthA-rightN-ref.html?border_parent
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html?border_parent leftN-widthN-rightA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html?border_parent leftA-widthN-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html?border_parent leftA-widthA-rightN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos.list
index 367564e647ae..137d6c8d2c21 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos.list
@@ -1,26 +1,26 @@
 # Please see the comment at the beginning of reftest.list
 
-== leftN-widthA-rightA.html?margin_abspos leftN-widthA-rightA-ref.html?margin_abspos
-== leftN-widthA-rightA-2.html?margin_abspos leftN-widthA-rightA-2-ref.html?margin_abspos
-== leftN-widthA-rightN.html?margin_abspos leftN-widthA-rightN-ref.html?margin_abspos
-== leftN-widthA-rightN-2.html?margin_abspos leftN-widthA-rightN-2-ref.html?margin_abspos
+skip-if(Mulet) == leftN-widthA-rightA.html?margin_abspos leftN-widthA-rightA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html?margin_abspos leftN-widthA-rightA-2-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html?margin_abspos leftN-widthA-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html?margin_abspos leftN-widthA-rightN-2-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html?margin_abspos leftA-widthN-rightA-ref.html?margin_abspos
-== leftN-widthN-rightA.html?margin_abspos leftN-widthN-rightA-ref.html?margin_abspos
-== leftA-widthN-rightN.html?margin_abspos leftA-widthN-rightN-ref.html?margin_abspos
-== leftA-widthA-rightN.html?margin_abspos leftA-widthA-rightN-ref.html?margin_abspos
-== toauto-leftN-widthA-rightA.html?margin_abspos toauto-leftN-widthA-rightA-ref.html?margin_abspos
-== toauto-leftN-widthA-rightA-2.html?margin_abspos toauto-leftN-widthA-rightA-2-ref.html?margin_abspos
-== toauto-leftN-widthA-rightN.html?margin_abspos toauto-leftN-widthA-rightN-ref.html?margin_abspos
-== toauto-leftN-widthA-rightN-2.html?margin_abspos toauto-leftN-widthA-rightN-2-ref.html?margin_abspos
+skip-if(Mulet) == leftN-widthN-rightA.html?margin_abspos leftN-widthN-rightA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html?margin_abspos leftA-widthN-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html?margin_abspos leftA-widthA-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html?margin_abspos toauto-leftN-widthA-rightA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html?margin_abspos toauto-leftN-widthA-rightA-2-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html?margin_abspos toauto-leftN-widthA-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html?margin_abspos toauto-leftN-widthA-rightN-2-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html?margin_abspos toauto-leftA-widthN-rightA-ref.html?margin_abspos
-== toauto-leftN-widthN-rightA.html?margin_abspos toauto-leftN-widthN-rightA-ref.html?margin_abspos
-== toauto-leftA-widthN-rightN.html?margin_abspos toauto-leftA-widthN-rightN-ref.html?margin_abspos
-== toauto-leftA-widthA-rightN.html?margin_abspos toauto-leftA-widthA-rightN-ref.html?margin_abspos
-== fromauto-leftN-widthA-rightA.html?margin_abspos leftN-widthA-rightA-ref.html?margin_abspos
-random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?margin_abspos leftN-widthA-rightA-2-ref.html?margin_abspos # Bug 688545
-== fromauto-leftN-widthA-rightN.html?margin_abspos leftN-widthA-rightN-ref.html?margin_abspos
-== fromauto-leftN-widthA-rightN-2.html?margin_abspos leftN-widthA-rightN-2-ref.html?margin_abspos
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html?margin_abspos toauto-leftN-widthN-rightA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html?margin_abspos toauto-leftA-widthN-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html?margin_abspos toauto-leftA-widthA-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html?margin_abspos leftN-widthA-rightA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+random-if(cocoaWidget) skip-if(Mulet) == fromauto-leftN-widthA-rightA-2.html?margin_abspos leftN-widthA-rightA-2-ref.html?margin_abspos # Bug 688545 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html?margin_abspos leftN-widthA-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html?margin_abspos leftN-widthA-rightN-2-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html?margin_abspos leftA-widthN-rightA-ref.html?margin_abspos
-== fromauto-leftN-widthN-rightA.html?margin_abspos leftN-widthN-rightA-ref.html?margin_abspos
-== fromauto-leftA-widthN-rightN.html?margin_abspos leftA-widthN-rightN-ref.html?margin_abspos
-== fromauto-leftA-widthA-rightN.html?margin_abspos leftA-widthA-rightN-ref.html?margin_abspos
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html?margin_abspos leftN-widthN-rightA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html?margin_abspos leftA-widthN-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html?margin_abspos leftA-widthA-rightN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent.list
index d1aaff8edbfb..9dcaaa49414f 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent.list
@@ -1,26 +1,26 @@
 # Please see the comment at the beginning of reftest.list
 
-== leftN-widthA-rightA.html?margin_parent leftN-widthA-rightA-ref.html?margin_parent
-== leftN-widthA-rightA-2.html?margin_parent leftN-widthA-rightA-2-ref.html?margin_parent
-== leftN-widthA-rightN.html?margin_parent leftN-widthA-rightN-ref.html?margin_parent
-== leftN-widthA-rightN-2.html?margin_parent leftN-widthA-rightN-2-ref.html?margin_parent
+skip-if(Mulet) == leftN-widthA-rightA.html?margin_parent leftN-widthA-rightA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html?margin_parent leftN-widthA-rightA-2-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html?margin_parent leftN-widthA-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html?margin_parent leftN-widthA-rightN-2-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html?margin_parent leftA-widthN-rightA-ref.html?margin_parent
-== leftN-widthN-rightA.html?margin_parent leftN-widthN-rightA-ref.html?margin_parent
-== leftA-widthN-rightN.html?margin_parent leftA-widthN-rightN-ref.html?margin_parent
-== leftA-widthA-rightN.html?margin_parent leftA-widthA-rightN-ref.html?margin_parent
-== toauto-leftN-widthA-rightA.html?margin_parent toauto-leftN-widthA-rightA-ref.html?margin_parent
-== toauto-leftN-widthA-rightA-2.html?margin_parent toauto-leftN-widthA-rightA-2-ref.html?margin_parent
-== toauto-leftN-widthA-rightN.html?margin_parent toauto-leftN-widthA-rightN-ref.html?margin_parent
-== toauto-leftN-widthA-rightN-2.html?margin_parent toauto-leftN-widthA-rightN-2-ref.html?margin_parent
+skip-if(Mulet) == leftN-widthN-rightA.html?margin_parent leftN-widthN-rightA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html?margin_parent leftA-widthN-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html?margin_parent leftA-widthA-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html?margin_parent toauto-leftN-widthA-rightA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html?margin_parent toauto-leftN-widthA-rightA-2-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html?margin_parent toauto-leftN-widthA-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html?margin_parent toauto-leftN-widthA-rightN-2-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html?margin_parent toauto-leftA-widthN-rightA-ref.html?margin_parent
-== toauto-leftN-widthN-rightA.html?margin_parent toauto-leftN-widthN-rightA-ref.html?margin_parent
-== toauto-leftA-widthN-rightN.html?margin_parent toauto-leftA-widthN-rightN-ref.html?margin_parent
-== toauto-leftA-widthA-rightN.html?margin_parent toauto-leftA-widthA-rightN-ref.html?margin_parent
-== fromauto-leftN-widthA-rightA.html?margin_parent leftN-widthA-rightA-ref.html?margin_parent
-random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?margin_parent leftN-widthA-rightA-2-ref.html?margin_parent # Bug 688545
-== fromauto-leftN-widthA-rightN.html?margin_parent leftN-widthA-rightN-ref.html?margin_parent
-== fromauto-leftN-widthA-rightN-2.html?margin_parent leftN-widthA-rightN-2-ref.html?margin_parent
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html?margin_parent toauto-leftN-widthN-rightA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html?margin_parent toauto-leftA-widthN-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html?margin_parent toauto-leftA-widthA-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html?margin_parent leftN-widthA-rightA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?margin_parent leftN-widthA-rightA-2-ref.html?margin_parent # Bug 688545 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html?margin_parent leftN-widthA-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html?margin_parent leftN-widthA-rightN-2-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html?margin_parent leftA-widthN-rightA-ref.html?margin_parent
-== fromauto-leftN-widthN-rightA.html?margin_parent leftN-widthN-rightA-ref.html?margin_parent
-== fromauto-leftA-widthN-rightN.html?margin_parent leftA-widthN-rightN-ref.html?margin_parent
-== fromauto-leftA-widthA-rightN.html?margin_parent leftA-widthA-rightN-ref.html?margin_parent
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html?margin_parent leftN-widthN-rightA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html?margin_parent leftA-widthN-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html?margin_parent leftA-widthA-rightN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos.list
index 03952c6d1535..ff5e0b4ef621 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos.list
@@ -1,26 +1,26 @@
 # Please see the comment at the beginning of reftest.list
 
-== leftN-widthA-rightA.html?padding_abspos leftN-widthA-rightA-ref.html?padding_abspos
-== leftN-widthA-rightA-2.html?padding_abspos leftN-widthA-rightA-2-ref.html?padding_abspos
-== leftN-widthA-rightN.html?padding_abspos leftN-widthA-rightN-ref.html?padding_abspos
-== leftN-widthA-rightN-2.html?padding_abspos leftN-widthA-rightN-2-ref.html?padding_abspos
+skip-if(Mulet) == leftN-widthA-rightA.html?padding_abspos leftN-widthA-rightA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html?padding_abspos leftN-widthA-rightA-2-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html?padding_abspos leftN-widthA-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html?padding_abspos leftN-widthA-rightN-2-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html?padding_abspos leftA-widthN-rightA-ref.html?padding_abspos
-== leftN-widthN-rightA.html?padding_abspos leftN-widthN-rightA-ref.html?padding_abspos
-== leftA-widthN-rightN.html?padding_abspos leftA-widthN-rightN-ref.html?padding_abspos
-== leftA-widthA-rightN.html?padding_abspos leftA-widthA-rightN-ref.html?padding_abspos
-== toauto-leftN-widthA-rightA.html?padding_abspos toauto-leftN-widthA-rightA-ref.html?padding_abspos
-== toauto-leftN-widthA-rightA-2.html?padding_abspos toauto-leftN-widthA-rightA-2-ref.html?padding_abspos
-== toauto-leftN-widthA-rightN.html?padding_abspos toauto-leftN-widthA-rightN-ref.html?padding_abspos
-== toauto-leftN-widthA-rightN-2.html?padding_abspos toauto-leftN-widthA-rightN-2-ref.html?padding_abspos
+skip-if(Mulet) == leftN-widthN-rightA.html?padding_abspos leftN-widthN-rightA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html?padding_abspos leftA-widthN-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html?padding_abspos leftA-widthA-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html?padding_abspos toauto-leftN-widthA-rightA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html?padding_abspos toauto-leftN-widthA-rightA-2-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html?padding_abspos toauto-leftN-widthA-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html?padding_abspos toauto-leftN-widthA-rightN-2-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html?padding_abspos toauto-leftA-widthN-rightA-ref.html?padding_abspos
-== toauto-leftN-widthN-rightA.html?padding_abspos toauto-leftN-widthN-rightA-ref.html?padding_abspos
-== toauto-leftA-widthN-rightN.html?padding_abspos toauto-leftA-widthN-rightN-ref.html?padding_abspos
-== toauto-leftA-widthA-rightN.html?padding_abspos toauto-leftA-widthA-rightN-ref.html?padding_abspos
-== fromauto-leftN-widthA-rightA.html?padding_abspos leftN-widthA-rightA-ref.html?padding_abspos
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html?padding_abspos toauto-leftN-widthN-rightA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html?padding_abspos toauto-leftA-widthN-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html?padding_abspos toauto-leftA-widthA-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html?padding_abspos leftN-widthA-rightA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?padding_abspos leftN-widthA-rightA-2-ref.html?padding_abspos # Bug 688545
-== fromauto-leftN-widthA-rightN.html?padding_abspos leftN-widthA-rightN-ref.html?padding_abspos
-== fromauto-leftN-widthA-rightN-2.html?padding_abspos leftN-widthA-rightN-2-ref.html?padding_abspos
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html?padding_abspos leftN-widthA-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html?padding_abspos leftN-widthA-rightN-2-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html?padding_abspos leftA-widthN-rightA-ref.html?padding_abspos
-== fromauto-leftN-widthN-rightA.html?padding_abspos leftN-widthN-rightA-ref.html?padding_abspos
-== fromauto-leftA-widthN-rightN.html?padding_abspos leftA-widthN-rightN-ref.html?padding_abspos
-== fromauto-leftA-widthA-rightN.html?padding_abspos leftA-widthA-rightN-ref.html?padding_abspos
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html?padding_abspos leftN-widthN-rightA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html?padding_abspos leftA-widthN-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html?padding_abspos leftA-widthA-rightN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent.list
index e1cdf6a019eb..6b5a64caf54d 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent.list
@@ -1,26 +1,26 @@
 # Please see the comment at the beginning of reftest.list
 
-== leftN-widthA-rightA.html?padding_parent leftN-widthA-rightA-ref.html?padding_parent
-== leftN-widthA-rightA-2.html?padding_parent leftN-widthA-rightA-2-ref.html?padding_parent
-== leftN-widthA-rightN.html?padding_parent leftN-widthA-rightN-ref.html?padding_parent
-== leftN-widthA-rightN-2.html?padding_parent leftN-widthA-rightN-2-ref.html?padding_parent
+skip-if(Mulet) == leftN-widthA-rightA.html?padding_parent leftN-widthA-rightA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html?padding_parent leftN-widthA-rightA-2-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html?padding_parent leftN-widthA-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html?padding_parent leftN-widthA-rightN-2-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html?padding_parent leftA-widthN-rightA-ref.html?padding_parent
-== leftN-widthN-rightA.html?padding_parent leftN-widthN-rightA-ref.html?padding_parent
-== leftA-widthN-rightN.html?padding_parent leftA-widthN-rightN-ref.html?padding_parent
-== leftA-widthA-rightN.html?padding_parent leftA-widthA-rightN-ref.html?padding_parent
-== toauto-leftN-widthA-rightA.html?padding_parent toauto-leftN-widthA-rightA-ref.html?padding_parent
-== toauto-leftN-widthA-rightA-2.html?padding_parent toauto-leftN-widthA-rightA-2-ref.html?padding_parent
-== toauto-leftN-widthA-rightN.html?padding_parent toauto-leftN-widthA-rightN-ref.html?padding_parent
-== toauto-leftN-widthA-rightN-2.html?padding_parent toauto-leftN-widthA-rightN-2-ref.html?padding_parent
+skip-if(Mulet) == leftN-widthN-rightA.html?padding_parent leftN-widthN-rightA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html?padding_parent leftA-widthN-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html?padding_parent leftA-widthA-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html?padding_parent toauto-leftN-widthA-rightA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html?padding_parent toauto-leftN-widthA-rightA-2-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html?padding_parent toauto-leftN-widthA-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html?padding_parent toauto-leftN-widthA-rightN-2-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html?padding_parent toauto-leftA-widthN-rightA-ref.html?padding_parent
-== toauto-leftN-widthN-rightA.html?padding_parent toauto-leftN-widthN-rightA-ref.html?padding_parent
-== toauto-leftA-widthN-rightN.html?padding_parent toauto-leftA-widthN-rightN-ref.html?padding_parent
-== toauto-leftA-widthA-rightN.html?padding_parent toauto-leftA-widthA-rightN-ref.html?padding_parent
-== fromauto-leftN-widthA-rightA.html?padding_parent leftN-widthA-rightA-ref.html?padding_parent
-random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?padding_parent leftN-widthA-rightA-2-ref.html?padding_parent # Bug 688545
-== fromauto-leftN-widthA-rightN.html?padding_parent leftN-widthA-rightN-ref.html?padding_parent
-== fromauto-leftN-widthA-rightN-2.html?padding_parent leftN-widthA-rightN-2-ref.html?padding_parent
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html?padding_parent toauto-leftN-widthN-rightA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html?padding_parent toauto-leftA-widthN-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html?padding_parent toauto-leftA-widthA-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html?padding_parent leftN-widthA-rightA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?padding_parent leftN-widthA-rightA-2-ref.html?padding_parent # Bug 688545 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html?padding_parent leftN-widthA-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html?padding_parent leftN-widthA-rightN-2-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html?padding_parent leftA-widthN-rightA-ref.html?padding_parent
-== fromauto-leftN-widthN-rightA.html?padding_parent leftN-widthN-rightA-ref.html?padding_parent
-== fromauto-leftA-widthN-rightN.html?padding_parent leftA-widthN-rightN-ref.html?padding_parent
-== fromauto-leftA-widthA-rightN.html?padding_parent leftA-widthA-rightN-ref.html?padding_parent
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html?padding_parent leftN-widthN-rightA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html?padding_parent leftA-widthN-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html?padding_parent leftA-widthA-rightN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_plain.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_plain.list
index a2c84623e16b..d8c6bef7f770 100644
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest_plain.list
+++ b/layout/reftests/position-dynamic-changes/horizontal/reftest_plain.list
@@ -1,26 +1,26 @@
 # Please see the comment at the beginning of reftest.list
 
-== leftN-widthA-rightA.html leftN-widthA-rightA-ref.html
-== leftN-widthA-rightA-2.html leftN-widthA-rightA-2-ref.html
-== leftN-widthA-rightN.html leftN-widthA-rightN-ref.html
-== leftN-widthA-rightN-2.html leftN-widthA-rightN-2-ref.html
+skip-if(Mulet) == leftN-widthA-rightA.html leftN-widthA-rightA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightA-2.html leftN-widthA-rightA-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN.html leftN-widthA-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftN-widthA-rightN-2.html leftN-widthA-rightN-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == leftA-widthN-rightA.html leftA-widthN-rightA-ref.html
-== leftN-widthN-rightA.html leftN-widthN-rightA-ref.html
-== leftA-widthN-rightN.html leftA-widthN-rightN-ref.html
-== leftA-widthA-rightN.html leftA-widthA-rightN-ref.html
-== toauto-leftN-widthA-rightA.html toauto-leftN-widthA-rightA-ref.html
-== toauto-leftN-widthA-rightA-2.html toauto-leftN-widthA-rightA-2-ref.html
-== toauto-leftN-widthA-rightN.html toauto-leftN-widthA-rightN-ref.html
-== toauto-leftN-widthA-rightN-2.html toauto-leftN-widthA-rightN-2-ref.html
+skip-if(Mulet) == leftN-widthN-rightA.html leftN-widthN-rightA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthN-rightN.html leftA-widthN-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == leftA-widthA-rightN.html leftA-widthA-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA.html toauto-leftN-widthA-rightA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightA-2.html toauto-leftN-widthA-rightA-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN.html toauto-leftN-widthA-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftN-widthA-rightN-2.html toauto-leftN-widthA-rightN-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-leftA-widthN-rightA.html toauto-leftA-widthN-rightA-ref.html
-== toauto-leftN-widthN-rightA.html toauto-leftN-widthN-rightA-ref.html
-== toauto-leftA-widthN-rightN.html toauto-leftA-widthN-rightN-ref.html
-== toauto-leftA-widthA-rightN.html toauto-leftA-widthA-rightN-ref.html
-== fromauto-leftN-widthA-rightA.html leftN-widthA-rightA-ref.html
-random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html leftN-widthA-rightA-2-ref.html # Bug 688545
-== fromauto-leftN-widthA-rightN.html leftN-widthA-rightN-ref.html
-== fromauto-leftN-widthA-rightN-2.html leftN-widthA-rightN-2-ref.html
+skip-if(Mulet) == toauto-leftN-widthN-rightA.html toauto-leftN-widthN-rightA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthN-rightN.html toauto-leftA-widthN-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-leftA-widthA-rightN.html toauto-leftA-widthA-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightA.html leftN-widthA-rightA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html leftN-widthA-rightA-2-ref.html # Bug 688545 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN.html leftN-widthA-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftN-widthA-rightN-2.html leftN-widthA-rightN-2-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-leftA-widthN-rightA.html leftA-widthN-rightA-ref.html
-== fromauto-leftN-widthN-rightA.html leftN-widthN-rightA-ref.html
-== fromauto-leftA-widthN-rightN.html leftA-widthN-rightN-ref.html
-== fromauto-leftA-widthA-rightN.html leftA-widthA-rightN-ref.html
+skip-if(Mulet) == fromauto-leftN-widthN-rightA.html leftN-widthN-rightA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthN-rightN.html leftA-widthN-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-leftA-widthA-rightN.html leftA-widthA-rightN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos.list
index 50f7fd79967a..34f02b682114 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?border_abspos mixed-dimentionN-ref.html?border_abspos
-== mixed-dimentionA.html?border_abspos mixed-dimentionA-ref.html?border_abspos
+skip-if(Mulet) == mixed-dimentionN.html?border_abspos mixed-dimentionN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?border_abspos mixed-dimentionA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent.list
index d91c20c80b3b..a058659e16a6 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?border_parent mixed-dimentionN-ref.html?border_parent
-== mixed-dimentionA.html?border_parent mixed-dimentionA-ref.html?border_parent
+skip-if(Mulet) == mixed-dimentionN.html?border_parent mixed-dimentionN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?border_parent mixed-dimentionA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos.list
index 291136470cb3..0c8e7fab116d 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?margin_abspos mixed-dimentionN-ref.html?margin_abspos
-== mixed-dimentionA.html?margin_abspos mixed-dimentionA-ref.html?margin_abspos
+skip-if(Mulet) == mixed-dimentionN.html?margin_abspos mixed-dimentionN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?margin_abspos mixed-dimentionA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent.list
index 91e4d906ca4b..d4a8c9201a1a 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
 == mixed-dimentionN.html?margin_parent mixed-dimentionN-ref.html?margin_parent
-== mixed-dimentionA.html?margin_parent mixed-dimentionA-ref.html?margin_parent
+skip-if(Mulet) == mixed-dimentionA.html?margin_parent mixed-dimentionA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos.list
index b88c03e2e982..242b67df5d32 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?padding_abspos mixed-dimentionN-ref.html?padding_abspos
-== mixed-dimentionA.html?padding_abspos mixed-dimentionA-ref.html?padding_abspos
+skip-if(Mulet) == mixed-dimentionN.html?padding_abspos mixed-dimentionN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?padding_abspos mixed-dimentionA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent.list
index 8571cb2d608b..7b7ebdb0375f 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?padding_parent mixed-dimentionN-ref.html?padding_parent
-== mixed-dimentionA.html?padding_parent mixed-dimentionA-ref.html?padding_parent
+skip-if(Mulet) == mixed-dimentionN.html?padding_parent mixed-dimentionN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?padding_parent mixed-dimentionA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain.list
index 474456ef2c51..5311562d2055 100644
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain.list
+++ b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html mixed-dimentionN-ref.html
-== mixed-dimentionA.html mixed-dimentionA-ref.html
+skip-if(Mulet) == mixed-dimentionN.html mixed-dimentionN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html mixed-dimentionA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos.list b/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos.list
index 50f7fd79967a..34f02b682114 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?border_abspos mixed-dimentionN-ref.html?border_abspos
-== mixed-dimentionA.html?border_abspos mixed-dimentionA-ref.html?border_abspos
+skip-if(Mulet) == mixed-dimentionN.html?border_abspos mixed-dimentionN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?border_abspos mixed-dimentionA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent.list b/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent.list
index d91c20c80b3b..a058659e16a6 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?border_parent mixed-dimentionN-ref.html?border_parent
-== mixed-dimentionA.html?border_parent mixed-dimentionA-ref.html?border_parent
+skip-if(Mulet) == mixed-dimentionN.html?border_parent mixed-dimentionN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?border_parent mixed-dimentionA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos.list b/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos.list
index 291136470cb3..0c8e7fab116d 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?margin_abspos mixed-dimentionN-ref.html?margin_abspos
-== mixed-dimentionA.html?margin_abspos mixed-dimentionA-ref.html?margin_abspos
+skip-if(Mulet) == mixed-dimentionN.html?margin_abspos mixed-dimentionN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?margin_abspos mixed-dimentionA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent.list b/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent.list
index 91e4d906ca4b..fd6a4c9f561e 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?margin_parent mixed-dimentionN-ref.html?margin_parent
-== mixed-dimentionA.html?margin_parent mixed-dimentionA-ref.html?margin_parent
+skip-if(Mulet) == mixed-dimentionN.html?margin_parent mixed-dimentionN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?margin_parent mixed-dimentionA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos.list b/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos.list
index b88c03e2e982..242b67df5d32 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?padding_abspos mixed-dimentionN-ref.html?padding_abspos
-== mixed-dimentionA.html?padding_abspos mixed-dimentionA-ref.html?padding_abspos
+skip-if(Mulet) == mixed-dimentionN.html?padding_abspos mixed-dimentionN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?padding_abspos mixed-dimentionA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent.list b/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent.list
index 8571cb2d608b..7b7ebdb0375f 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html?padding_parent mixed-dimentionN-ref.html?padding_parent
-== mixed-dimentionA.html?padding_parent mixed-dimentionA-ref.html?padding_parent
+skip-if(Mulet) == mixed-dimentionN.html?padding_parent mixed-dimentionN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html?padding_parent mixed-dimentionA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_plain.list b/layout/reftests/position-dynamic-changes/mixed/reftest_plain.list
index 474456ef2c51..5311562d2055 100644
--- a/layout/reftests/position-dynamic-changes/mixed/reftest_plain.list
+++ b/layout/reftests/position-dynamic-changes/mixed/reftest_plain.list
@@ -1,4 +1,4 @@
 # Please see the comment at the beginning of reftest.list
 
-== mixed-dimentionN.html mixed-dimentionN-ref.html
-== mixed-dimentionA.html mixed-dimentionA-ref.html
+skip-if(Mulet) == mixed-dimentionN.html mixed-dimentionN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == mixed-dimentionA.html mixed-dimentionA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables. # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/relative/reftest.list b/layout/reftests/position-dynamic-changes/relative/reftest.list
index 78354e07f404..4e654b57b86e 100644
--- a/layout/reftests/position-dynamic-changes/relative/reftest.list
+++ b/layout/reftests/position-dynamic-changes/relative/reftest.list
@@ -1,5 +1,5 @@
-random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-right-bottom.html move-right-bottom-ref.html # Bug 742176
-random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-top-left.html move-top-left-ref.html # Bug 688545, bug 742176
-random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-right-bottom-table.html move-right-bottom-table-ref.html # Bug 742176
-random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545, bug 742176
+skip-if(Mulet) random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-right-bottom.html move-right-bottom-ref.html # Bug 742176 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-top-left.html move-top-left-ref.html # Bug 688545, bug 742176 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-right-bottom-table.html move-right-bottom-table-ref.html # Bug 742176 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) random-if(cocoaWidget) fuzzy-if(d2d,85,80) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545, bug 742176 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == percent.html percent-ref.html
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest.listbackup b/layout/reftests/position-dynamic-changes/vertical/reftest.listbackup
index 86a90a0cdf52..e8bc5655ccbd 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest.listbackup
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest.listbackup
@@ -1,12 +1,12 @@
-== topN-heightA-bottomA.html topN-heightA-bottomA-ref.html
-== topN-heightA-bottomN.html topN-heightA-bottomN-ref.html
+skip-if(Mulet) == topN-heightA-bottomA.html topN-heightA-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html topN-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html topA-heightN-bottomA-ref.html
-== topN-heightN-bottomA.html topN-heightN-bottomA-ref.html
-== topA-heightN-bottomN.html topA-heightN-bottomN-ref.html
-== topA-heightA-bottomN.html topA-heightA-bottomN-ref.html
-== toauto-topN-heightA-bottomA.html toauto-topN-heightA-bottomA-ref.html
-== toauto-topN-heightA-bottomN.html toauto-topN-heightA-bottomN-ref.html
+skip-if(Mulet) == topN-heightN-bottomA.html topN-heightN-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html topA-heightN-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html topA-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html toauto-topN-heightA-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html toauto-topN-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html toauto-topA-heightN-bottomA-ref.html
-== toauto-topN-heightN-bottomA.html toauto-topN-heightN-bottomA-ref.html
-== toauto-topA-heightN-bottomN.html toauto-topA-heightN-bottomN-ref.html
-== toauto-topA-heightA-bottomN.html toauto-topA-heightA-bottomN-ref.html
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html toauto-topN-heightN-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html toauto-topA-heightN-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html toauto-topA-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos.list b/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos.list
index c44516cfa545..a2f0fd19a89f 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html?border_abspos topN-heightA-bottomA-ref.html?border_abspos
-== topN-heightA-bottomN.html?border_abspos topN-heightA-bottomN-ref.html?border_abspos
+skip-if(Mulet) == topN-heightA-bottomA.html?border_abspos topN-heightA-bottomA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html?border_abspos topN-heightA-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html?border_abspos topA-heightN-bottomA-ref.html?border_abspos
-== topN-heightN-bottomA.html?border_abspos topN-heightN-bottomA-ref.html?border_abspos
-== topA-heightN-bottomN.html?border_abspos topA-heightN-bottomN-ref.html?border_abspos
-== topA-heightA-bottomN.html?border_abspos topA-heightA-bottomN-ref.html?border_abspos
-== toauto-topN-heightA-bottomA.html?border_abspos toauto-topN-heightA-bottomA-ref.html?border_abspos
-== toauto-topN-heightA-bottomN.html?border_abspos toauto-topN-heightA-bottomN-ref.html?border_abspos
+skip-if(Mulet) == topN-heightN-bottomA.html?border_abspos topN-heightN-bottomA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html?border_abspos topA-heightN-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html?border_abspos topA-heightA-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html?border_abspos toauto-topN-heightA-bottomA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html?border_abspos toauto-topN-heightA-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html?border_abspos toauto-topA-heightN-bottomA-ref.html?border_abspos
-== toauto-topN-heightN-bottomA.html?border_abspos toauto-topN-heightN-bottomA-ref.html?border_abspos
-== toauto-topA-heightN-bottomN.html?border_abspos toauto-topA-heightN-bottomN-ref.html?border_abspos
-== toauto-topA-heightA-bottomN.html?border_abspos toauto-topA-heightA-bottomN-ref.html?border_abspos
-== fromauto-topN-heightA-bottomA.html?border_abspos topN-heightA-bottomA-ref.html?border_abspos
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html?border_abspos toauto-topN-heightN-bottomA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html?border_abspos toauto-topA-heightN-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html?border_abspos toauto-topA-heightA-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html?border_abspos topN-heightA-bottomA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(B2G||Mulet) == fromauto-topN-heightA-bottomN.html?border_abspos topN-heightA-bottomN-ref.html?border_abspos # Initial mulet triage: parity with B2G/B2G Desktop
 == fromauto-topA-heightN-bottomA.html?border_abspos topA-heightN-bottomA-ref.html?border_abspos
-== fromauto-topN-heightN-bottomA.html?border_abspos topN-heightN-bottomA-ref.html?border_abspos
-== fromauto-topA-heightN-bottomN.html?border_abspos topA-heightN-bottomN-ref.html?border_abspos
-== fromauto-topA-heightA-bottomN.html?border_abspos topA-heightA-bottomN-ref.html?border_abspos
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html?border_abspos topN-heightN-bottomA-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html?border_abspos topA-heightN-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html?border_abspos topA-heightA-bottomN-ref.html?border_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent.list b/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent.list
index 4005e1f1882f..c06b7dab5262 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html?border_parent topN-heightA-bottomA-ref.html?border_parent
-== topN-heightA-bottomN.html?border_parent topN-heightA-bottomN-ref.html?border_parent
+skip-if(Mulet) == topN-heightA-bottomA.html?border_parent topN-heightA-bottomA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html?border_parent topN-heightA-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html?border_parent topA-heightN-bottomA-ref.html?border_parent
-== topN-heightN-bottomA.html?border_parent topN-heightN-bottomA-ref.html?border_parent
-== topA-heightN-bottomN.html?border_parent topA-heightN-bottomN-ref.html?border_parent
-== topA-heightA-bottomN.html?border_parent topA-heightA-bottomN-ref.html?border_parent
-== toauto-topN-heightA-bottomA.html?border_parent toauto-topN-heightA-bottomA-ref.html?border_parent
-== toauto-topN-heightA-bottomN.html?border_parent toauto-topN-heightA-bottomN-ref.html?border_parent
+skip-if(Mulet) == topN-heightN-bottomA.html?border_parent topN-heightN-bottomA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html?border_parent topA-heightN-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html?border_parent topA-heightA-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html?border_parent toauto-topN-heightA-bottomA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html?border_parent toauto-topN-heightA-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html?border_parent toauto-topA-heightN-bottomA-ref.html?border_parent
-== toauto-topN-heightN-bottomA.html?border_parent toauto-topN-heightN-bottomA-ref.html?border_parent
-== toauto-topA-heightN-bottomN.html?border_parent toauto-topA-heightN-bottomN-ref.html?border_parent
-== toauto-topA-heightA-bottomN.html?border_parent toauto-topA-heightA-bottomN-ref.html?border_parent
-== fromauto-topN-heightA-bottomA.html?border_parent topN-heightA-bottomA-ref.html?border_parent
-== fromauto-topN-heightA-bottomN.html?border_parent topN-heightA-bottomN-ref.html?border_parent
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html?border_parent toauto-topN-heightN-bottomA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html?border_parent toauto-topA-heightN-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html?border_parent toauto-topA-heightA-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html?border_parent topN-heightA-bottomA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomN.html?border_parent topN-heightA-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-topA-heightN-bottomA.html?border_parent topA-heightN-bottomA-ref.html?border_parent
-== fromauto-topN-heightN-bottomA.html?border_parent topN-heightN-bottomA-ref.html?border_parent
-== fromauto-topA-heightN-bottomN.html?border_parent topA-heightN-bottomN-ref.html?border_parent
-== fromauto-topA-heightA-bottomN.html?border_parent topA-heightA-bottomN-ref.html?border_parent
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html?border_parent topN-heightN-bottomA-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html?border_parent topA-heightN-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html?border_parent topA-heightA-bottomN-ref.html?border_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos.list b/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos.list
index 732548689e8a..0ad936629084 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html?margin_abspos topN-heightA-bottomA-ref.html?margin_abspos
-== topN-heightA-bottomN.html?margin_abspos topN-heightA-bottomN-ref.html?margin_abspos
+skip-if(Mulet) == topN-heightA-bottomA.html?margin_abspos topN-heightA-bottomA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html?margin_abspos topN-heightA-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html?margin_abspos topA-heightN-bottomA-ref.html?margin_abspos
-== topN-heightN-bottomA.html?margin_abspos topN-heightN-bottomA-ref.html?margin_abspos
-== topA-heightN-bottomN.html?margin_abspos topA-heightN-bottomN-ref.html?margin_abspos
-== topA-heightA-bottomN.html?margin_abspos topA-heightA-bottomN-ref.html?margin_abspos
-== toauto-topN-heightA-bottomA.html?margin_abspos toauto-topN-heightA-bottomA-ref.html?margin_abspos
-== toauto-topN-heightA-bottomN.html?margin_abspos toauto-topN-heightA-bottomN-ref.html?margin_abspos
+skip-if(Mulet) == topN-heightN-bottomA.html?margin_abspos topN-heightN-bottomA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html?margin_abspos topA-heightN-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html?margin_abspos topA-heightA-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html?margin_abspos toauto-topN-heightA-bottomA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html?margin_abspos toauto-topN-heightA-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html?margin_abspos toauto-topA-heightN-bottomA-ref.html?margin_abspos
-== toauto-topN-heightN-bottomA.html?margin_abspos toauto-topN-heightN-bottomA-ref.html?margin_abspos
-== toauto-topA-heightN-bottomN.html?margin_abspos toauto-topA-heightN-bottomN-ref.html?margin_abspos
-== toauto-topA-heightA-bottomN.html?margin_abspos toauto-topA-heightA-bottomN-ref.html?margin_abspos
-== fromauto-topN-heightA-bottomA.html?margin_abspos topN-heightA-bottomA-ref.html?margin_abspos
-== fromauto-topN-heightA-bottomN.html?margin_abspos topN-heightA-bottomN-ref.html?margin_abspos
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html?margin_abspos toauto-topN-heightN-bottomA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html?margin_abspos toauto-topA-heightN-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html?margin_abspos toauto-topA-heightA-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html?margin_abspos topN-heightA-bottomA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomN.html?margin_abspos topN-heightA-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-topA-heightN-bottomA.html?margin_abspos topA-heightN-bottomA-ref.html?margin_abspos
-== fromauto-topN-heightN-bottomA.html?margin_abspos topN-heightN-bottomA-ref.html?margin_abspos
-== fromauto-topA-heightN-bottomN.html?margin_abspos topA-heightN-bottomN-ref.html?margin_abspos
-== fromauto-topA-heightA-bottomN.html?margin_abspos topA-heightA-bottomN-ref.html?margin_abspos
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html?margin_abspos topN-heightN-bottomA-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html?margin_abspos topA-heightN-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html?margin_abspos topA-heightA-bottomN-ref.html?margin_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent.list b/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent.list
index e1af174cb58e..4ef3df4566af 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html?margin_parent topN-heightA-bottomA-ref.html?margin_parent
-== topN-heightA-bottomN.html?margin_parent topN-heightA-bottomN-ref.html?margin_parent
+skip-if(Mulet) == topN-heightA-bottomA.html?margin_parent topN-heightA-bottomA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html?margin_parent topN-heightA-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html?margin_parent topA-heightN-bottomA-ref.html?margin_parent
-== topN-heightN-bottomA.html?margin_parent topN-heightN-bottomA-ref.html?margin_parent
-== topA-heightN-bottomN.html?margin_parent topA-heightN-bottomN-ref.html?margin_parent
-== topA-heightA-bottomN.html?margin_parent topA-heightA-bottomN-ref.html?margin_parent
-== toauto-topN-heightA-bottomA.html?margin_parent toauto-topN-heightA-bottomA-ref.html?margin_parent
-== toauto-topN-heightA-bottomN.html?margin_parent toauto-topN-heightA-bottomN-ref.html?margin_parent
+skip-if(Mulet) == topN-heightN-bottomA.html?margin_parent topN-heightN-bottomA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html?margin_parent topA-heightN-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html?margin_parent topA-heightA-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html?margin_parent toauto-topN-heightA-bottomA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html?margin_parent toauto-topN-heightA-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html?margin_parent toauto-topA-heightN-bottomA-ref.html?margin_parent
-== toauto-topN-heightN-bottomA.html?margin_parent toauto-topN-heightN-bottomA-ref.html?margin_parent
-== toauto-topA-heightN-bottomN.html?margin_parent toauto-topA-heightN-bottomN-ref.html?margin_parent
-== toauto-topA-heightA-bottomN.html?margin_parent toauto-topA-heightA-bottomN-ref.html?margin_parent
-== fromauto-topN-heightA-bottomA.html?margin_parent topN-heightA-bottomA-ref.html?margin_parent
-== fromauto-topN-heightA-bottomN.html?margin_parent topN-heightA-bottomN-ref.html?margin_parent
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html?margin_parent toauto-topN-heightN-bottomA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html?margin_parent toauto-topA-heightN-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html?margin_parent toauto-topA-heightA-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html?margin_parent topN-heightA-bottomA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomN.html?margin_parent topN-heightA-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-topA-heightN-bottomA.html?margin_parent topA-heightN-bottomA-ref.html?margin_parent
-== fromauto-topN-heightN-bottomA.html?margin_parent topN-heightN-bottomA-ref.html?margin_parent
-== fromauto-topA-heightN-bottomN.html?margin_parent topA-heightN-bottomN-ref.html?margin_parent
-== fromauto-topA-heightA-bottomN.html?margin_parent topA-heightA-bottomN-ref.html?margin_parent
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html?margin_parent topN-heightN-bottomA-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html?margin_parent topA-heightN-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html?margin_parent topA-heightA-bottomN-ref.html?margin_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos.list b/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos.list
index 1b1bc586a04b..3a58a578f05b 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html?padding_abspos topN-heightA-bottomA-ref.html?padding_abspos
-== topN-heightA-bottomN.html?padding_abspos topN-heightA-bottomN-ref.html?padding_abspos
+skip-if(Mulet) == topN-heightA-bottomA.html?padding_abspos topN-heightA-bottomA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html?padding_abspos topN-heightA-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html?padding_abspos topA-heightN-bottomA-ref.html?padding_abspos
-== topN-heightN-bottomA.html?padding_abspos topN-heightN-bottomA-ref.html?padding_abspos
-== topA-heightN-bottomN.html?padding_abspos topA-heightN-bottomN-ref.html?padding_abspos
-== topA-heightA-bottomN.html?padding_abspos topA-heightA-bottomN-ref.html?padding_abspos
-== toauto-topN-heightA-bottomA.html?padding_abspos toauto-topN-heightA-bottomA-ref.html?padding_abspos
-== toauto-topN-heightA-bottomN.html?padding_abspos toauto-topN-heightA-bottomN-ref.html?padding_abspos
+skip-if(Mulet) == topN-heightN-bottomA.html?padding_abspos topN-heightN-bottomA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html?padding_abspos topA-heightN-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html?padding_abspos topA-heightA-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html?padding_abspos toauto-topN-heightA-bottomA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html?padding_abspos toauto-topN-heightA-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html?padding_abspos toauto-topA-heightN-bottomA-ref.html?padding_abspos
-== toauto-topN-heightN-bottomA.html?padding_abspos toauto-topN-heightN-bottomA-ref.html?padding_abspos
-== toauto-topA-heightN-bottomN.html?padding_abspos toauto-topA-heightN-bottomN-ref.html?padding_abspos
-== toauto-topA-heightA-bottomN.html?padding_abspos toauto-topA-heightA-bottomN-ref.html?padding_abspos
-== fromauto-topN-heightA-bottomA.html?padding_abspos topN-heightA-bottomA-ref.html?padding_abspos
-== fromauto-topN-heightA-bottomN.html?padding_abspos topN-heightA-bottomN-ref.html?padding_abspos
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html?padding_abspos toauto-topN-heightN-bottomA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html?padding_abspos toauto-topA-heightN-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html?padding_abspos toauto-topA-heightA-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html?padding_abspos topN-heightA-bottomA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomN.html?padding_abspos topN-heightA-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-topA-heightN-bottomA.html?padding_abspos topA-heightN-bottomA-ref.html?padding_abspos
-== fromauto-topN-heightN-bottomA.html?padding_abspos topN-heightN-bottomA-ref.html?padding_abspos
-== fromauto-topA-heightN-bottomN.html?padding_abspos topA-heightN-bottomN-ref.html?padding_abspos
-== fromauto-topA-heightA-bottomN.html?padding_abspos topA-heightA-bottomN-ref.html?padding_abspos
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html?padding_abspos topN-heightN-bottomA-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html?padding_abspos topA-heightN-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html?padding_abspos topA-heightA-bottomN-ref.html?padding_abspos # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent.list b/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent.list
index 41ae5995e0b1..53a5e395b5fd 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html?padding_parent topN-heightA-bottomA-ref.html?padding_parent
-== topN-heightA-bottomN.html?padding_parent topN-heightA-bottomN-ref.html?padding_parent
+skip-if(Mulet) == topN-heightA-bottomA.html?padding_parent topN-heightA-bottomA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html?padding_parent topN-heightA-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html?padding_parent topA-heightN-bottomA-ref.html?padding_parent
-== topN-heightN-bottomA.html?padding_parent topN-heightN-bottomA-ref.html?padding_parent
-== topA-heightN-bottomN.html?padding_parent topA-heightN-bottomN-ref.html?padding_parent
-== topA-heightA-bottomN.html?padding_parent topA-heightA-bottomN-ref.html?padding_parent
-== toauto-topN-heightA-bottomA.html?padding_parent toauto-topN-heightA-bottomA-ref.html?padding_parent
-== toauto-topN-heightA-bottomN.html?padding_parent toauto-topN-heightA-bottomN-ref.html?padding_parent
+skip-if(Mulet) == topN-heightN-bottomA.html?padding_parent topN-heightN-bottomA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html?padding_parent topA-heightN-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html?padding_parent topA-heightA-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html?padding_parent toauto-topN-heightA-bottomA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html?padding_parent toauto-topN-heightA-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html?padding_parent toauto-topA-heightN-bottomA-ref.html?padding_parent
-== toauto-topN-heightN-bottomA.html?padding_parent toauto-topN-heightN-bottomA-ref.html?padding_parent
-== toauto-topA-heightN-bottomN.html?padding_parent toauto-topA-heightN-bottomN-ref.html?padding_parent
-== toauto-topA-heightA-bottomN.html?padding_parent toauto-topA-heightA-bottomN-ref.html?padding_parent
-== fromauto-topN-heightA-bottomA.html?padding_parent topN-heightA-bottomA-ref.html?padding_parent
-== fromauto-topN-heightA-bottomN.html?padding_parent topN-heightA-bottomN-ref.html?padding_parent
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html?padding_parent toauto-topN-heightN-bottomA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html?padding_parent toauto-topA-heightN-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html?padding_parent toauto-topA-heightA-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html?padding_parent topN-heightA-bottomA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomN.html?padding_parent topN-heightA-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-topA-heightN-bottomA.html?padding_parent topA-heightN-bottomA-ref.html?padding_parent
-== fromauto-topN-heightN-bottomA.html?padding_parent topN-heightN-bottomA-ref.html?padding_parent
-== fromauto-topA-heightN-bottomN.html?padding_parent topA-heightN-bottomN-ref.html?padding_parent
-== fromauto-topA-heightA-bottomN.html?padding_parent topA-heightA-bottomN-ref.html?padding_parent
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html?padding_parent topN-heightN-bottomA-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html?padding_parent topA-heightN-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html?padding_parent topA-heightA-bottomN-ref.html?padding_parent # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_plain.list b/layout/reftests/position-dynamic-changes/vertical/reftest_plain.list
index 2e760ef2c2de..7cf566898a3e 100644
--- a/layout/reftests/position-dynamic-changes/vertical/reftest_plain.list
+++ b/layout/reftests/position-dynamic-changes/vertical/reftest_plain.list
@@ -1,20 +1,20 @@
 # Please see the comment at the beginning of reftest.list
 
-== topN-heightA-bottomA.html topN-heightA-bottomA-ref.html
-== topN-heightA-bottomN.html topN-heightA-bottomN-ref.html
+skip-if(Mulet) == topN-heightA-bottomA.html topN-heightA-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topN-heightA-bottomN.html topN-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == topA-heightN-bottomA.html topA-heightN-bottomA-ref.html
-== topN-heightN-bottomA.html topN-heightN-bottomA-ref.html
-== topA-heightN-bottomN.html topA-heightN-bottomN-ref.html
-== topA-heightA-bottomN.html topA-heightA-bottomN-ref.html
-== toauto-topN-heightA-bottomA.html toauto-topN-heightA-bottomA-ref.html
-== toauto-topN-heightA-bottomN.html toauto-topN-heightA-bottomN-ref.html
+skip-if(Mulet) == topN-heightN-bottomA.html topN-heightN-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightN-bottomN.html topA-heightN-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == topA-heightA-bottomN.html topA-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomA.html toauto-topN-heightA-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topN-heightA-bottomN.html toauto-topN-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == toauto-topA-heightN-bottomA.html toauto-topA-heightN-bottomA-ref.html
-== toauto-topN-heightN-bottomA.html toauto-topN-heightN-bottomA-ref.html
-== toauto-topA-heightN-bottomN.html toauto-topA-heightN-bottomN-ref.html
-== toauto-topA-heightA-bottomN.html toauto-topA-heightA-bottomN-ref.html
-== fromauto-topN-heightA-bottomA.html topN-heightA-bottomA-ref.html
-== fromauto-topN-heightA-bottomN.html topN-heightA-bottomN-ref.html
+skip-if(Mulet) == toauto-topN-heightN-bottomA.html toauto-topN-heightN-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightN-bottomN.html toauto-topA-heightN-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == toauto-topA-heightA-bottomN.html toauto-topA-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomA.html topN-heightA-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topN-heightA-bottomN.html topN-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == fromauto-topA-heightN-bottomA.html topA-heightN-bottomA-ref.html
-== fromauto-topN-heightN-bottomA.html topN-heightN-bottomA-ref.html
-== fromauto-topA-heightN-bottomN.html topA-heightN-bottomN-ref.html
-== fromauto-topA-heightA-bottomN.html topA-heightA-bottomN-ref.html
+skip-if(Mulet) == fromauto-topN-heightN-bottomA.html topN-heightN-bottomA-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightN-bottomN.html topA-heightN-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == fromauto-topA-heightA-bottomN.html topA-heightA-bottomN-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/printing/reftest.list b/layout/reftests/printing/reftest.list
index bca4d7cf9a8f..245f33001759 100644
--- a/layout/reftests/printing/reftest.list
+++ b/layout/reftests/printing/reftest.list
@@ -8,7 +8,7 @@
 random-if((B2G&&browserIsRemote)||Mulet) == 381497-n.html 381497-f.html # reftest-print doesn't work on B2G (scrollbar difference only) # Initial mulet triage: parity with B2G/B2G Desktop
 == test-async-print.html 272830-1-ref.html
 fails-if(B2G||Mulet) == 129941-1a.html 129941-1-ref.html # reftest-print doesn't work on B2G # Initial mulet triage: parity with B2G/B2G Desktop
-== 129941-1b.html 129941-1-ref.html
+skip-if(Mulet) == 129941-1b.html 129941-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 609227-1.html 609227-1-ref.html
 fails-if(B2G||Mulet) == 609227-2a.html 609227-2-ref.html # reftest-print doesn't work on B2G # Initial mulet triage: parity with B2G/B2G Desktop
 fails-if(B2G||Mulet) == 609227-2b.html 609227-2-ref.html # reftest-print doesn't work on B2G # Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index ba8c80cd5708..e91a6f6605ff 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -181,8 +181,8 @@ fails != reftest-opaque-layer-fail.html about:blank
 fails != about:blank reftest-opaque-layer-fail.html
 
 # reftest-opaque-layer and reftest-wait
-== reftest-opaque-layer-wait-pass.html reftest-opaque-layer-pass.html
-!= reftest-opaque-layer-wait-pass.html about:blank
+skip-if(Mulet) == reftest-opaque-layer-wait-pass.html reftest-opaque-layer-pass.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) != reftest-opaque-layer-wait-pass.html about:blank # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fails == reftest-opaque-layer-wait-fail.html reftest-opaque-layer-fail.html
 fails != reftest-opaque-layer-wait-fail.html about:blank
 
diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list
index b32a345ad235..4f81b8579cbb 100644
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,7 +1,7 @@
 skip-if((B2G&&browserIsRemote)||Mulet) HTTP == deferred-anchor.xhtml#d deferred-anchor-ref.xhtml#d # Initial mulet triage: parity with B2G/B2G Desktop
-== deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d
+skip-if(Mulet) == deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 HTTP == fixed-1.html fixed-1.html?ref
-HTTP == fixed-table-1.html fixed-table-1.html?ref
+skip-if(Mulet) HTTP == fixed-table-1.html fixed-table-1.html?ref # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
 skip-if(B2G||Mulet) HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) random-if(gtk2Widget) fuzzy-if(Android,3,60) HTTP == fixed-text-1.html fixed-text-1.html?ref # Initial mulet triage: parity with B2G/B2G Desktop
@@ -11,11 +11,11 @@ random-if(Android) HTTP == image-1.html image-1.html?ref
 random-if(Android&&!browserIsRemote) HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref # bug 760269
 skip-if(B2G||Mulet) random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357 # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-1.html scroll-behavior-1.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-2.html scroll-behavior-2.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-3.html scroll-behavior-3.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-4.html scroll-behavior-4.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-5.html scroll-behavior-5.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html?ref # see bug 1041833
+skip-if(Android||Mulet) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-2.html scroll-behavior-2.html?ref # see bug 1041833 # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Android||Mulet) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-3.html scroll-behavior-3.html?ref # see bug 1041833 # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Android||Mulet) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-4.html scroll-behavior-4.html?ref # see bug 1041833 # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Android||Mulet) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-5.html scroll-behavior-5.html?ref # see bug 1041833 # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html?ref # see bug 1041833 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-7.html scroll-behavior-7.html?ref # see bug 1041833
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-8.html scroll-behavior-8.html?ref # see bug 1041833
 skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-9.html scroll-behavior-9.html?ref # see bug 1041833
diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list
index 8b4260de39ed..d08c15b36e90 100644
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -4,7 +4,7 @@
 include zoom/reftest.list
 
 # Background-image tests
-== background-display-none-1.html  about:blank
+skip-if(Mulet) == background-display-none-1.html  about:blank # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(B2G||Mulet) == background-simple-1.html  lime100x100-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
 == background-simple-2.html  lime100x100-ref.html
 
@@ -73,7 +73,7 @@ random == img-and-image-1.html img-and-image-1-ref.svg # bug 645267
 == img-blobURI-1.html lime100x100-ref.html
 random == img-blobURI-2.html lime100x100-ref.html
 fuzzy-if(d2d,16,10) == img-content-outside-viewBox-1.html img-content-outside-viewBox-1-ref.html # d2d is bug 1074161
-== img-display-none-1.html about:blank
+skip-if(Mulet) == img-display-none-1.html about:blank # MULET: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == img-dyn-1.html img-dyn-1-ref.html
 == img-foreignObject-1.html lime100x100-ref.html
 
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 17d4bac5606a..ad942b09838e 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -53,8 +53,8 @@ fuzzy-if(/^Windows\x20NT\x206\.[12]/.test(http.oscpu),1,5) fuzzy-if(azureQuartz,
 == currentColor-01.svg pass.svg
 == currentColor-02.svg pass.svg
 == currentColor-03.svg pass.svg
-== data-uri-with-filter-01.xhtml data-uri-with-filter-01-ref.svg
-== data-uri-with-gradient-01.xhtml data-uri-with-gradient-01-ref.svg
+skip-if(Mulet) == data-uri-with-filter-01.xhtml data-uri-with-filter-01-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == data-uri-with-gradient-01.xhtml data-uri-with-gradient-01-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == data-uri-with-pattern-01.xhtml pass.svg
 == dynamic-attr-removal-1.svg pass.svg
 == dynamic-attr-removal-2.svg pass.svg
@@ -180,10 +180,10 @@ fuzzy-if(Android,18,600) == foreignObject-fixedpos-01.html foreignObject-dynamic
 == foreignObject-dynamic-fixedpos-01.html foreignObject-dynamic-abspos-01-ref.html
 == g-transform-01.svg pass.svg
 == getElementById-a-element-01.svg pass.svg
-fuzzy-if(Android||B2G,9,980||Mulet,9,980) == gradient-live-01a.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android||B2G,9,980||Mulet,9,980) == gradient-live-01b.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android||B2G,9,980||Mulet,9,980) == gradient-live-01c.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android||B2G,9,980||Mulet,9,980) == gradient-live-01d.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop
+fuzzy-if(Android||B2G,9,980) skip-if(Mulet) == gradient-live-01a.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+fuzzy-if(Android||B2G,9,980) skip-if(Mulet) == gradient-live-01b.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+fuzzy-if(Android||B2G,9,980) skip-if(Mulet) == gradient-live-01c.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+fuzzy-if(Android||B2G,9,980) skip-if(Mulet) == gradient-live-01d.svg gradient-live-01-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == gradient-transform-01.svg pass.svg
 == import-svg-01.html pass.svg
 == invalid-text-01.svg pass.svg
@@ -397,25 +397,25 @@ random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-06.svg tspa
 == href-attr-change-restyles.svg href-attr-change-restyles-ref.svg
 == mask-img.html mask-img-ref.html
 
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-burn.svg blend-color-burn-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-dodge.svg blend-color-dodge-ref.svg
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-burn.svg blend-color-burn-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-dodge.svg blend-color-dodge-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 # pref(layout.css.mix-blend-mode.enabled,true) == blend-color.svg blend-color-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-darken.svg blend-darken-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference.svg blend-difference-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-exclusion.svg blend-exclusion-ref.svg
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-darken.svg blend-darken-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference.svg blend-difference-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-exclusion.svg blend-exclusion-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 # pref(layout.css.mix-blend-mode.enabled,true) == blend-hard-light.svg blend-hard-light-ref.svg
 # pref(layout.css.mix-blend-mode.enabled,true) == blend-hue.svg blend-hue-ref.svg
 skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-blend.svg blend-layer-blend-ref.svg
 skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-filter.svg blend-layer-filter-ref.svg
 skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-mask.svg blend-layer-mask-ref.svg
 skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-opacity.svg blend-layer-opacity-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-lighten.svg blend-lighten-ref.svg
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-lighten.svg blend-lighten-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 # pref(layout.css.mix-blend-mode.enabled,true) == blend-luminosity.svg blend-luminosity-ref.svg
 #skip-if(B2G||Mulet||Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply-alpha.svg blend-multiply-alpha-ref.svg # Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply.svg blend-multiply-ref.svg
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply.svg blend-multiply-ref.svg # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 pref(layout.css.mix-blend-mode.enabled,true) == blend-normal.svg blend-normal-ref.svg
 #skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-overlay.svg blend-overlay-ref.svg
 #skip-if(Android)  pref(layout.css.mix-blend-mode.enabled,true) == blend-saturation.svg blend-saturation-ref.svg
 #skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-screen.svg blend-screen-ref.svg
 #skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-soft-light.svg blend-soft-light-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking-ref.html
+skip-if(Mulet) skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/table-overflow/reftest.list b/layout/reftests/table-overflow/reftest.list
index 6937f8dae190..4ad67ee18f9b 100644
--- a/layout/reftests/table-overflow/reftest.list
+++ b/layout/reftests/table-overflow/reftest.list
@@ -2,4 +2,4 @@
 == bug785684-y.html bug785684-ref.html
 == table-row-pagination.html table-row-pagination-ref.html
 == 963441.html 963441-ref.html
-== table-caption-scroll.html table-caption-scroll-ref.html
+skip-if(Mulet) == table-caption-scroll.html table-caption-scroll-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/layout/reftests/text-overflow/reftest.list b/layout/reftests/text-overflow/reftest.list
index 71f0cd1c2857..15209bb50332 100644
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -3,7 +3,7 @@ skip-if(B2G||Mulet) == ellipsis-font-fallback.html ellipsis-font-fallback-ref.ht
 fuzzy-if(Android,16,244) skip-if(B2G||Mulet) HTTP(..) == marker-basic.html marker-basic-ref.html  # Bug 1128229 # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) HTTP(..) == marker-string.html marker-string-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(Android||B2G) HTTP(..) == bidi-simple.html bidi-simple-ref.html # Fails on Android due to anti-aliasing
-skip-if(!gtk2Widget) fuzzy-if(gtk2Widget,1,104) HTTP(..) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
+skip-if(!gtk2Widget) fuzzy-if(gtk2Widget,1,104) skip-if(Mulet) HTTP(..) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(B2G||Mulet) fuzzy-if(Android&&AndroidVersion<15,9,2545) fuzzy-if(Android&&AndroidVersion>=15,24,4000) fuzzy-if(cocoaWidget,1,40) HTTP(..) == scroll-rounding.html scroll-rounding-ref.html # bug 760264 # Initial mulet triage: parity with B2G/B2G Desktop
 fuzzy-if(OSX==1008,1,1) HTTP(..) == anonymous-block.html anonymous-block-ref.html
 skip-if(B2G||Mulet) HTTP(..) == false-marker-overlap.html false-marker-overlap-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
@@ -19,7 +19,7 @@ HTTP(..) == marker-shadow.html marker-shadow-ref.html
 skip-if(Android||B2G) == clipped-elements.html clipped-elements-ref.html
 HTTP(..) == theme-overflow.html theme-overflow-ref.html
 skip-if(B2G||Mulet) HTTP(..) == table-cell.html table-cell-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == two-value-syntax.html two-value-syntax-ref.html
+skip-if(Mulet) HTTP(..) == two-value-syntax.html two-value-syntax-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 skip-if(B2G||Mulet) HTTP(..) == single-value.html single-value-ref.html  # Initial mulet triage: parity with B2G/B2G Desktop
 skip-if(B2G||Mulet) HTTP(..) == atomic-under-marker.html atomic-under-marker-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
 fuzzy(1,702) skip-if(Android||B2G||Mulet) HTTP(..) == xulscroll.html xulscroll-ref.html # Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/text-transform/reftest.list b/layout/reftests/text-transform/reftest.list
index fd824abc55c7..f2816c75b76f 100644
--- a/layout/reftests/text-transform/reftest.list
+++ b/layout/reftests/text-transform/reftest.list
@@ -5,7 +5,7 @@
 == capitalize-5.html capitalize-5-ref.html
 == capitalize-6.html capitalize-6-ref.html
 == capitalize-7.html capitalize-7-ref.html
-== capitalize-7a.html capitalize-7-ref.html
+skip-if(Mulet) == capitalize-7a.html capitalize-7-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == lowercase-1.html lowercase-ref.html
 == lowercase-sigma-1.html lowercase-sigma-1-ref.html
 fails-if(B2G||Mulet) random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp' # Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index 00379dcc7849..2fd42f119582 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -11,7 +11,7 @@ random-if(!cocoaWidget) == font-size-adjust-02.html font-size-adjust-02-ref.html
 # in the "obvious" way, but it is unclear what the behavior should really be;
 # see bug #366138 for some (inconclusive) discussion
 # == font-size-adjust-03.html font-size-adjust-03-ref.html
-== justification-1.html justification-1-ref.html
+skip-if(Mulet) == justification-1.html justification-1-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == justification-2a.html justification-2-ref.html
 == justification-2b.html justification-2-ref.html
 == justification-2c.html justification-2-ref.html
@@ -45,7 +45,7 @@ fuzzy-if(Android,255,42) == pre-line-1.html pre-line-1-ref.html
 # Cairo's FreeType and GDI backends snap glyphs to pixels, while Mac (usually)
 # and D2D have subpixel positioning.  The tests for pixel-snapping assume that
 # 1 CSS pixel == 1 device pixel
-fails-if(Android) skip-if(d2d||cocoaWidget) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
+skip-if(Mulet) fails-if(Android) skip-if(d2d||cocoaWidget) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 # Platforms with subpixel positioning already have inconsistent glyphs by
 # design, but that is considered more tolerable because they are subpixel
 # inconsistencies.  On those platforms we just test that glyph positions are
@@ -54,8 +54,8 @@ fails-if(Android) skip-if(d2d||cocoaWidget) == subpixel-glyphs-x-1a.html subpixe
 skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
 skip-if(B2G||Mulet) HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html # Initial mulet triage: parity with B2G/B2G Desktop
 # No platforms do subpixel positioning vertically
-fuzzy-if(Android,19,2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
-fuzzy-if((Android||B2G),231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
+skip-if(Mulet) fuzzy-if(Android,19,2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if((Android||B2G),231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == swash-1.html swash-1-ref.html
 HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
 HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01-ref.html
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index 83841f08860c..fb438fba1991 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -20,10 +20,10 @@ fuzzy-if(cocoaWidget,17,3) == preserve3d-1a.html preserve3d-1-ref.html
 == preserve3d-2d.html preserve3d-2-ref.html
 == preserve3d-3a.html preserve3d-3-ref.html
 skip-if(B2G||Mulet) == preserve3d-4a.html green-rect.html # Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android&&AndroidVersion>=15,4,300) == preserve3d-5a.html preserve3d-5-ref.html
+skip-if(Mulet) fuzzy-if(Android&&AndroidVersion>=15,4,300) == preserve3d-5a.html preserve3d-5-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == scale3d-z.html scalez-1-ref.html
-fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all.html scale3d-1-ref.html # subpixel AA
-fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA
+skip-if(Mulet) fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all.html scale3d-1-ref.html # subpixel AA # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == scale3d-xz.html scale3d-1-ref.html
 == translatez-1a.html translatez-1-ref.html
 != translatez-1b.html translatez-1-ref.html
@@ -52,6 +52,6 @@ fuzzy-if(winWidget&&!layersGPUAccelerated,1,61) == perspective-origin-3a.html pe
 == rotatex-transformorigin-1a.html rotatex-transformorigin-1-ref.html
 fuzzy-if((gtk2Widget&&layersOMTC)||(winWidget&&!layersGPUAccelerated),1,86) == overflow-hidden-1a.html overflow-hidden-1-ref.html
 == transform-style-flat-1a.html transform-style-flat-1-ref.html
-pref(layout.css.will-change.enabled,true) == willchange-containing-block.html?willchange willchange-containing-block.html?ref
-pref(layout.css.will-change.enabled,true) != willchange-containing-block.html?willchange willchange-containing-block.html?noblock
+skip-if(Mulet) pref(layout.css.will-change.enabled,true) == willchange-containing-block.html?willchange willchange-containing-block.html?ref # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) pref(layout.css.will-change.enabled,true) != willchange-containing-block.html?willchange willchange-containing-block.html?noblock # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 fuzzy-if(winWidget&&!layersGPUAccelerated,1,606) == scroll-perspective-1.html scroll-perspective-1-ref.html
diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest.list b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
index 9a1ea8f6cf8b..609799fab75d 100644
--- a/layout/reftests/w3c-css/submitted/flexbox/reftest.list
+++ b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
@@ -149,7 +149,7 @@ fails == flexbox-min-width-auto-002b.html flexbox-min-width-auto-002-ref.html #
 == flexbox-overflow-horiz-003.html flexbox-overflow-horiz-003-ref.html
 == flexbox-overflow-horiz-004.html flexbox-overflow-horiz-004-ref.html
 == flexbox-overflow-horiz-005.html flexbox-overflow-horiz-005-ref.html
-== flexbox-overflow-vert-001.html flexbox-overflow-vert-001-ref.html
+skip-if(Mulet) == flexbox-overflow-vert-001.html flexbox-overflow-vert-001-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == flexbox-overflow-vert-002.html flexbox-overflow-vert-002-ref.html
 == flexbox-overflow-vert-003.html flexbox-overflow-vert-003-ref.html
 == flexbox-overflow-vert-004.html flexbox-overflow-vert-004-ref.html
diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list
index 33aad840990b..008e1fb8cff7 100644
--- a/layout/reftests/writing-mode/reftest.list
+++ b/layout/reftests/writing-mode/reftest.list
@@ -18,7 +18,7 @@ fuzzy-if(gtk2Widget,255,2) fuzzy-if(winWidget||Android||B2G,4,8704) HTTP(..) ==
 == 1090168-1.html 1090168-1-ref.html
 != 1090168-1.html 1090168-1-notref.html
 == 1090168-2.html 1090168-2-ref.html
-fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) == 1090168-3.html 1090168-3-ref.html # bug 1142928: mark fuzzy on Mulet as on B2G
+fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) skip-if(Mulet) == 1090168-3.html 1090168-3-ref.html # bug 1142928: mark fuzzy on Mulet as on B2G # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 == 1091058-1.html 1091058-1-ref.html
 random-if(gtk2Widget) == 1094434-1.html 1094434-1-ref.html # bug 1094845
 random-if(gtk2Widget) == 1094434-2.html 1094434-2-ref.html # bug 1094845
@@ -106,9 +106,9 @@ HTTP(..) == 1127488-align-right-vertical-lr-ltr.html 1127488-align-bottom-left-r
 == 1131013-vertical-bidi.html 1131013-vertical-bidi-ref.html
 == 1134744-radio-checkbox-baseline-1.html 1134744-radio-checkbox-baseline-1-ref.html
 fails-if(B2G||Mulet) == 1135361-ruby-justify-1.html 1135361-ruby-justify-1-ref.html # bug 1136067 # Initial mulet triage: parity with B2G/B2G Desktop
-== 1136557-1-nested-spans.html 1136557-1-nested-spans-ref.html
-fuzzy-if(winWidget,255,69) == 1136557-2-nested-spans.html 1136557-2-nested-spans-ref.html
-== 1136557-3-nested-spans.html 1136557-3-nested-spans-ref.html
+skip-if(Mulet) == 1136557-1-nested-spans.html 1136557-1-nested-spans-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) fuzzy-if(winWidget,255,69) == 1136557-2-nested-spans.html 1136557-2-nested-spans-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if(Mulet) == 1136557-3-nested-spans.html 1136557-3-nested-spans-ref.html # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 
 # Font inflation behaves wrong in vertical writing mode: bug 1138495
 test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1a.html font-inflation-1-ref.html

From 77d1e01b3cb8793deadb2f2e4fe7a4e2e4d49d57 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Fri, 20 Mar 2015 00:45:00 +0100
Subject: [PATCH 48/80] Bug 1144080 - Disable mochitests on Mulet for
 TaskCluster. r=ahal

---
 dom/base/test/mochitest.ini             | 2 +-
 dom/html/test/mochitest.ini             | 3 +++
 dom/indexedDB/test/mochitest.ini        | 2 +-
 dom/ipc/tests/mochitest.ini             | 2 +-
 dom/media/tests/mochitest/mochitest.ini | 2 +-
 layout/generic/test/mochitest.ini       | 5 ++++-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index 8fb1707ea13a..79aea373a8f9 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -734,7 +734,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM
 [test_w3element_traversal.xhtml]
 [test_w3element_traversal_svg.html]
 [test_websocket.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
+skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' || e10s # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_websocket_basic.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android'
 [test_websocket_hello.html]
diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini
index 526505f6ccc3..2aaaeea83c0b 100644
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@@ -194,6 +194,7 @@ support-files =
 [test_anchor_href_cache_invalidation.html]
 [test_applet_attributes_reflection.html]
 [test_audio_wakelock.html]
+skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_base_attributes_reflection.html]
 [test_bug100533.html]
 [test_bug109445.html]
@@ -341,8 +342,10 @@ skip-if = (toolkit == 'gonk' && debug) || e10s #debug-only failure
 [test_bug601030.html]
 [test_bug605124-1.html]
 [test_bug605124-2.html]
+skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_bug605125-1.html]
 [test_bug605125-2.html]
+skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_bug606817.html]
 [test_bug607145.html]
 [test_bug610212.html]
diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini
index 9703ec3c92a9..7884581a87c2 100644
--- a/dom/indexedDB/test/mochitest.ini
+++ b/dom/indexedDB/test/mochitest.ini
@@ -322,7 +322,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_remove_index.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_remove_objectStore.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || (buildapp == 'mulet') # Bug 931116 # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_request_readyState.html]
 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 931116
 [test_setVersion.html]
diff --git a/dom/ipc/tests/mochitest.ini b/dom/ipc/tests/mochitest.ini
index b0590709c7ea..ffa4de1b05c8 100644
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@@ -13,4 +13,4 @@ skip-if = toolkit != 'gonk'
 [test_child_docshell.html]
 skip-if = toolkit == 'cocoa' # disabled due to hangs, see changeset 6852e7c47edf
 [test_CrashService_crash.html]
-skip-if = !(crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows') && (buildapp != 'b2g' || toolkit == 'gonk'))
+skip-if = !(crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows') && (buildapp != 'b2g' || toolkit == 'gonk') && (buildapp != 'mulet')) # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index a68723334ef9..5c67c81c7599 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -42,7 +42,7 @@ skip-if = (toolkit == 'gonk' && debug) # debug-only failure, turned an intermitt
 [test_getUserMedia_constraints.html]
 skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 1063290, intermittent timeout
 [test_getUserMedia_callbacks.html]
-skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 1063290, intermittent timeout
+skip-if = toolkit == 'gonk' || toolkit == 'android' || buildapp == 'mulet' # Bug 1063290, intermittent timeout # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_getUserMedia_gumWithinGum.html]
 skip-if = toolkit == 'gonk' || toolkit == 'android' # Bug 1063290, intermittent timeout
 [test_getUserMedia_playAudioTwice.html]
diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini
index 1c5830ea312f..126ec362582e 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -56,7 +56,7 @@ support-files = file_bug449653_1.html file_bug449653_1_ref.html
 [test_bug488417.html]
 skip-if = true # Bug 489560
 [test_bug496275.html]
-skip-if = toolkit == 'android' #CRASH_DUMP
+skip-if = toolkit == 'android' || buildapp == 'mulet' #CRASH_DUMP # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_bug503813.html]
 skip-if = buildapp == 'mulet' || toolkit == 'android' #CRASH_DUMP
 [test_bug507902.html]
@@ -72,9 +72,12 @@ support-files = file_bug579767_1.html file_bug579767_2.html
 [test_bug589621.html]
 [test_bug589623.html]
 [test_bug597333.html]
+skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_bug633762.html]
+skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 support-files = bug633762_iframe.html
 [test_bug666225.html]
+skip-if = buildapp == 'mulet' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_bug719503.html]
 [test_bug719515.html]
 [test_bug719518.html]

From 83b72f4ab3ebd0ddd1b8bc21ae14be6d9c82a1ba Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Mon, 16 Feb 2015 18:29:10 +0800
Subject: [PATCH 49/80] Bug 1089526 - Correct function name. r=baku

---
 dom/speakermanager/SpeakerManagerService.cpp | 12 ++++++------
 dom/speakermanager/SpeakerManagerService.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dom/speakermanager/SpeakerManagerService.cpp b/dom/speakermanager/SpeakerManagerService.cpp
index 5eabd704f534..8f816a0b666b 100644
--- a/dom/speakermanager/SpeakerManagerService.cpp
+++ b/dom/speakermanager/SpeakerManagerService.cpp
@@ -76,7 +76,7 @@ NS_IMPL_ISUPPORTS(SpeakerManagerService, nsIObserver)
 void
 SpeakerManagerService::ForceSpeaker(bool aEnable, uint64_t aChildId)
 {
-  TuruOnSpeaker(aEnable);
+  TurnOnSpeaker(aEnable);
   if (aEnable) {
     mSpeakerStatusSet.Put(aChildId);
   }
@@ -88,14 +88,14 @@ void
 SpeakerManagerService::ForceSpeaker(bool aEnable, bool aVisible)
 {
   // b2g main process without oop
-  TuruOnSpeaker(aEnable && aVisible);
+  TurnOnSpeaker(aEnable && aVisible);
   mVisible = aVisible;
   mOrgSpeakerStatus = aEnable;
   Notify();
 }
 
 void
-SpeakerManagerService::TuruOnSpeaker(bool aOn)
+SpeakerManagerService::TurnOnSpeaker(bool aOn)
 {
   nsCOMPtr<nsIAudioManager> audioManager = do_GetService(NS_AUDIOMANAGER_CONTRACTID);
   NS_ENSURE_TRUE_VOID(audioManager);
@@ -146,7 +146,7 @@ SpeakerManagerService::SetAudioChannelActive(bool aIsActive)
 }
 
 NS_IMETHODIMP
-SpeakerManagerService::Observe(nsISupports* aSubject, const char* 
+SpeakerManagerService::Observe(nsISupports* aSubject, const char*
                                aTopic, const char16_t* aData)
 {
   if (!strcmp(aTopic, "ipc:content-shutdown")) {
@@ -163,11 +163,11 @@ SpeakerManagerService::Observe(nsISupports* aSubject, const char*
         // If the audio has paused by audiochannel,
         // the enable flag should be false and don't need to handle.
         if (mSpeakerStatusSet.Contains(childID)) {
-          TuruOnSpeaker(false);
+          TurnOnSpeaker(false);
           mSpeakerStatusSet.Remove(childID);
         }
         if (mOrgSpeakerStatus) {
-          TuruOnSpeaker(!mOrgSpeakerStatus);
+          TurnOnSpeaker(!mOrgSpeakerStatus);
           mOrgSpeakerStatus = false;
         }
     } else {
diff --git a/dom/speakermanager/SpeakerManagerService.h b/dom/speakermanager/SpeakerManagerService.h
index 23d12e845a13..6cc35ae3df5f 100644
--- a/dom/speakermanager/SpeakerManagerService.h
+++ b/dom/speakermanager/SpeakerManagerService.h
@@ -58,7 +58,7 @@ protected:
   // Notify to UA if device speaker status changed
   virtual void Notify();
 
-  void TuruOnSpeaker(bool aEnable);
+  void TurnOnSpeaker(bool aEnable);
 
   nsTArray<nsRefPtr<SpeakerManager> > mRegisteredSpeakerManagers;
   // Set for remember all the child speaker status

From bb8b9b94f4d8bd0f3f922d1c9b43e810e03475ab Mon Sep 17 00:00:00 2001
From: Alastor Wu <alwu@mozilla.com>
Date: Mon, 16 Feb 2015 10:50:56 +0800
Subject: [PATCH 50/80] Bug 1089526 - Change speaker state. r=baku

---
 dom/audiochannel/AudioChannelService.cpp     | 7 +++++++
 dom/speakermanager/SpeakerManager.cpp        | 5 ++---
 dom/speakermanager/SpeakerManagerService.cpp | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dom/audiochannel/AudioChannelService.cpp b/dom/audiochannel/AudioChannelService.cpp
index 0b38827f09d4..ac8cd1cf4b3f 100644
--- a/dom/audiochannel/AudioChannelService.cpp
+++ b/dom/audiochannel/AudioChannelService.cpp
@@ -360,6 +360,13 @@ AudioChannelService::GetState(AudioChannelAgent* aAgent, bool aElementHidden)
 
   data->mState = GetStateInternal(data->mChannel, CONTENT_PROCESS_ID_MAIN,
                                 aElementHidden, oldElementHidden);
+  #ifdef MOZ_WIDGET_GONK
+    bool active = AnyAudioChannelIsActive();
+    for (uint32_t i = 0; i < mSpeakerManager.Length(); i++) {
+      mSpeakerManager[i]->SetAudioChannelActive(active);
+    }
+  #endif
+
   return data->mState;
 }
 
diff --git a/dom/speakermanager/SpeakerManager.cpp b/dom/speakermanager/SpeakerManager.cpp
index 0f113051affd..ac6810feffe6 100644
--- a/dom/speakermanager/SpeakerManager.cpp
+++ b/dom/speakermanager/SpeakerManager.cpp
@@ -211,12 +211,11 @@ SpeakerManager::HandleEvent(nsIDOMEvent* aEvent)
 void
 SpeakerManager::SetAudioChannelActive(bool isActive)
 {
-  if (!isActive && !mVisible) {
+  if (mForcespeaker) {
     SpeakerManagerService *service =
       SpeakerManagerService::GetOrCreateSpeakerManagerService();
     MOZ_ASSERT(service);
-
-    service->ForceSpeaker(false, mVisible);
+    service->ForceSpeaker(isActive, mVisible);
   }
 }
 
diff --git a/dom/speakermanager/SpeakerManagerService.cpp b/dom/speakermanager/SpeakerManagerService.cpp
index 8f816a0b666b..e7f4abe2171c 100644
--- a/dom/speakermanager/SpeakerManagerService.cpp
+++ b/dom/speakermanager/SpeakerManagerService.cpp
@@ -146,8 +146,9 @@ SpeakerManagerService::SetAudioChannelActive(bool aIsActive)
 }
 
 NS_IMETHODIMP
-SpeakerManagerService::Observe(nsISupports* aSubject, const char*
-                               aTopic, const char16_t* aData)
+SpeakerManagerService::Observe(nsISupports* aSubject,
+                               const char* aTopic,
+                               const char16_t* aData)
 {
   if (!strcmp(aTopic, "ipc:content-shutdown")) {
     nsCOMPtr<nsIPropertyBag2> props = do_QueryInterface(aSubject);

From 743504db95d0df29582dcf500430050028f6ff7e Mon Sep 17 00:00:00 2001
From: Ted Mielczarek <ted@mielczarek.org>
Date: Fri, 27 Feb 2015 08:58:57 -0500
Subject: [PATCH 51/80] bug 1085557 - Add Socorro symbol upload token file to
 mozconfigs. r=coop, a=tomcat

--HG--
extra : rebase_source : 2d2d582ba5cd7652ecf2a899d0d426daf6a4f6ee
extra : amend_source : 931cf9808decbd9291bc60497b60a249207d441a
---
 build/macosx/mozconfig.common | 2 ++
 build/mozconfig.win-common    | 2 ++
 build/unix/mozconfig.linux    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
index 37722f3062c2..1c352a673ede 100644
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -34,3 +34,5 @@ if [ -z "$CXX" ]; then
 fi
 
 . "$topsrcdir/build/mozconfig.cache"
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
diff --git a/build/mozconfig.win-common b/build/mozconfig.win-common
index abcde1863188..72e70f8f26a4 100644
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -11,3 +11,5 @@ fi
 # Some builds (eg: Mulet) don't want the installer, so only set this if it
 # hasn't already been set.
 MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/c/builds/crash-stats-api.token
diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
index 841af1e7bb46..5e7c0b3d4423 100644
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -40,3 +40,5 @@ if [ -d "$topsrcdir/gtk3" ]; then
   mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib"
   ac_add_options --enable-default-toolkit=cairo-gtk3
 fi
+
+export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token

From 9f640b91b575ada76049d29c68b00b4720490e76 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Sun, 8 Mar 2015 10:37:00 -0400
Subject: [PATCH 52/80] Bug 1134222 - Store the value of linkText that is
 calculated during nsContextMenu init and reuse it later rather than
 recalculating it. r=mconley

---
 browser/base/content/nsContextMenu.js | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 5b2d62cb62bb..7e6fd8e6c78f 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -151,6 +151,7 @@ nsContextMenu.prototype = {
       if (uri && uri.host) {
         this.linkURI = uri;
         this.linkURL = this.linkURI.spec;
+        this.linkText = linkText;
         this.onPlainTextLink = true;
       }
     }
@@ -576,6 +577,7 @@ nsContextMenu.prototype = {
     this.link              = null;
     this.linkURL           = "";
     this.linkURI           = null;
+    this.linkText          = "";
     this.linkProtocol      = "";
     this.linkHasNoReferrer = false;
     this.onMathML          = false;
@@ -737,6 +739,7 @@ nsContextMenu.prototype = {
           this.link = elem;
           this.linkURL = this.getLinkURL();
           this.linkURI = this.getLinkURI();
+          this.linkText = this.getLinkText();
           this.linkProtocol = this.getLinkProtocol();
           this.onMailtoLink = (this.linkProtocol == "mailto");
           this.onSaveableLink = this.isLinkSaveable( this.link );
@@ -1302,15 +1305,8 @@ nsContextMenu.prototype = {
   // Save URL of clicked-on link.
   saveLink: function() {
     var doc =  this.target.ownerDocument;
-    var linkText;
-    // If selected text is found to match valid URL pattern.
-    if (this.onPlainTextLink)
-      linkText = this.focusedWindow.getSelection().toString().trim();
-    else
-      linkText = this.linkText();
     urlSecurityCheck(this.linkURL, this.principal);
-
-    this.saveHelper(this.linkURL, linkText, null, true, doc);
+    this.saveHelper(this.linkURL, this.linkText, null, true, doc);
   },
 
   // Backwards-compatibility wrapper
@@ -1503,7 +1499,7 @@ nsContextMenu.prototype = {
   },
 
   // Get text of link.
-  linkText: function() {
+  getLinkText: function() {
     var text = gatherTextUnder(this.link);
     if (!text || !text.match(/\S/)) {
       text = this.link.getAttribute("title");
@@ -1598,14 +1594,8 @@ nsContextMenu.prototype = {
   },
 
   bookmarkLink: function CM_bookmarkLink() {
-    var linkText;
-    // If selected text is found to match valid URL pattern.
-    if (this.onPlainTextLink)
-      linkText = this.focusedWindow.getSelection().toString().trim();
-    else
-      linkText = this.linkText();
-    window.top.PlacesCommandHook.bookmarkLink(PlacesUtils.bookmarksMenuFolderId, this.linkURL,
-                                              linkText);
+    window.top.PlacesCommandHook.bookmarkLink(PlacesUtils.bookmarksMenuFolderId,
+                                              this.linkURL, this.linkText);
   },
 
   addBookmarkForFrame: function CM_addBookmarkForFrame() {
@@ -1699,7 +1689,7 @@ nsContextMenu.prototype = {
   // Formats the 'Search <engine> for "<selection or link text>"' context menu.
   formatSearchContextItem: function() {
     var menuItem = document.getElementById("context-searchselect");
-    var selectedText = this.isTextSelected ? this.textSelected : this.linkText();
+    let selectedText = this.isTextSelected ? this.textSelected : this.linkText;
 
     // Store searchTerms in context menu item so we know what to search onclick
     menuItem.searchTerms = selectedText;

From cfb644046c334c583c11eeaf431cb26a03b7d9d7 Mon Sep 17 00:00:00 2001
From: Ian Moody <moz-ian@perix.co.uk>
Date: Wed, 11 Mar 2015 21:19:30 +0000
Subject: [PATCH 53/80] Bug 1141186 - Fix context-menu Share commands so they
 don't use unsafe CPOWs. r=mconley

---
 browser/base/content/browser-context.inc | 2 +-
 browser/base/content/browser-social.js   | 2 +-
 browser/base/content/content.js          | 2 +-
 browser/base/content/nsContextMenu.js    | 4 ++--
 browser/base/content/socialmarks.xml     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index 1d651e95dc70..b542b5afac63 100644
--- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc
@@ -312,7 +312,7 @@
       <menuitem id="context-shareselect"
                 label="&shareSelect.label;"
                 accesskey="&shareSelect.accesskey;"
-                oncommand="gContextMenu.shareSelect(getBrowserSelection());"/>
+                oncommand="gContextMenu.shareSelect();"/>
       <menuseparator id="frame-sep"/>
       <menu id="frame" label="&thisFrameMenu.label;" accesskey="&thisFrameMenu.accesskey;">
         <menupopup>
diff --git a/browser/base/content/browser-social.js b/browser/base/content/browser-social.js
index 8c4a82e9aad2..80a187216a56 100644
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -658,7 +658,7 @@ SocialShare = {
         pageData.microdata = msg.data;
         this.sharePage(providerOrigin, pageData, target);
       });
-      gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicrodata", null, target);
+      gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicrodata", null, { target });
       return;
     }
     this.currentShare = pageData;
diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index 529be00a7d2d..e8d2f768755a 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -1024,7 +1024,7 @@ let PageMetadataMessenger = {
       }
 
       case "PageMetadata:GetMicrodata": {
-        let target = message.objects;
+        let target = message.objects.target;
         let result = PageMetadata.getMicrodata(content.document, target);
         sendAsyncMessage("PageMetadata:MicrodataResult", result);
         break;
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 7e6fd8e6c78f..7028e849c1a7 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1640,8 +1640,8 @@ nsContextMenu.prototype = {
     SocialShare.sharePage(null, { url: this.mediaURL, source: this.mediaURL }, this.target);
   },
 
-  shareSelect: function CM_shareSelect(selection) {
-    SocialShare.sharePage(null, { url: this.browser.currentURI.spec, text: selection }, this.target);
+  shareSelect: function CM_shareSelect() {
+    SocialShare.sharePage(null, { url: this.browser.currentURI.spec, text: this.textSelected }, this.target);
   },
 
   savePageAs: function CM_savePageAs() {
diff --git a/browser/base/content/socialmarks.xml b/browser/base/content/socialmarks.xml
index 0c1b13a09cc0..50bebae82012 100644
--- a/browser/base/content/socialmarks.xml
+++ b/browser/base/content/socialmarks.xml
@@ -163,7 +163,7 @@
             pageData.microdata = msg.data;
             this.loadPanel(pageData, target);
           });
-          gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicrodata", null, target);
+          gBrowser.selectedBrowser.messageManager.sendAsyncMessage("PageMetadata:GetMicrodata", null, { target });
           return;
         }
         this.pageData = pageData;

From 68627aa3d8e11971dbecb01348773550a6657a63 Mon Sep 17 00:00:00 2001
From: Abdelrhman Ahmed <a.ahmed1026@gmail.com>
Date: Wed, 18 Mar 2015 11:30:00 -0400
Subject: [PATCH 54/80] Bug 1143387 - Disable hover state in checked header
 button in share panel. r=jaws

---
 browser/themes/shared/customizableui/panelUIOverlay.inc.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index d4dbbcbf3568..bbc52a5f4ab3 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -505,7 +505,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   min-height: 40px;
   -moz-appearance: none;
   box-shadow: none;
-  border: none;  
+  border: none;
   border-radius: 0;
   transition: background-color;
   -moz-box-orient: horizontal;
@@ -796,7 +796,7 @@ panelview .toolbarbutton-1@buttonStateHover@,
 toolbarbutton.subviewbutton@buttonStateHover@,
 menu.subviewbutton@menuStateHover@,
 menuitem.subviewbutton@menuStateHover@,
-.share-provider-button@buttonStateHover@,
+.share-provider-button@buttonStateHover@:not([checked="true"]),
 .widget-overflow-list .toolbarbutton-1@buttonStateHover@,
 .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateHover@ {
   background-color: hsla(210,4%,10%,.08);

From ba53a7b5d95a6d3744c39daa7785f7987159ace2 Mon Sep 17 00:00:00 2001
From: Patrick Brosset <pbrosset@mozilla.com>
Date: Tue, 10 Mar 2015 16:28:57 +0100
Subject: [PATCH 55/80] Bug 1139186 - 1 - Refactor to the native anon nodes
 manipulation in highlighters; r=bgrins

--HG--
extra : rebase_source : 9c4de083d0daac370f5f609d3c4add904afdd037
---
 toolkit/devtools/server/actors/highlighter.js | 153 +++++++++---------
 1 file changed, 77 insertions(+), 76 deletions(-)

diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js
index 528763155343..5a07a106d14a 100644
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -1071,6 +1071,10 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
     this._currentNode = null;
   },
 
+  getElement: function(id) {
+    return this.markup.getElement(this.ID_CLASS_PREFIX + id);
+  },
+
   /**
    * Show the highlighter on a given node
    */
@@ -1143,16 +1147,14 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
    * Hide the infobar
    */
   _hideInfobar: function() {
-    this.markup.setAttributeForElement(
-      this.ID_CLASS_PREFIX + "nodeinfobar-container", "hidden", "true");
+    this.getElement("nodeinfobar-container").setAttribute("hidden", "true");
   },
 
   /**
    * Show the infobar
    */
   _showInfobar: function() {
-    this.markup.removeAttributeForElement(
-      this.ID_CLASS_PREFIX + "nodeinfobar-container", "hidden");
+    this.getElement("nodeinfobar-container").removeAttribute("hidden");
     this._updateInfobar();
   },
 
@@ -1160,16 +1162,14 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
    * Hide the box model
    */
   _hideBoxModel: function() {
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "elements",
-      "hidden", "true");
+    this.getElement("elements").setAttribute("hidden", "true");
   },
 
   /**
    * Show the box model
    */
   _showBoxModel: function() {
-    this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + "elements",
-      "hidden");
+    this.getElement("elements").removeAttribute("hidden");
   },
 
   /**
@@ -1239,12 +1239,12 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
 
     if (this._nodeNeedsHighlighting()) {
       for (let boxType of BOX_MODEL_REGIONS) {
+        let box = this.getElement(boxType);
+
         if (this.regionFill[boxType]) {
-          this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + boxType,
-            "style", "fill:" + this.regionFill[boxType]);
+          box.setAttribute("style", "fill:" + this.regionFill[boxType]);
         } else {
-          this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + boxType,
-            "style", "");
+          box.setAttribute("style", "");
         }
 
         if (!this.options.showOnly || this.options.showOnly === boxType) {
@@ -1257,10 +1257,9 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
                       "L" + p4.x + "," + p4.y);
           }
 
-          this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + boxType,
-            "d", path.join(" "));
+          box.setAttribute("d", path.join(" "));
         } else {
-          this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + boxType, "d");
+          box.removeAttribute("d");
         }
 
         if (boxType === this.options.region && !this.options.hideGuides) {
@@ -1367,8 +1366,7 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
 
   _hideGuides: function() {
     for (let side of BOX_MODEL_SIDES) {
-      this.markup.setAttributeForElement(
-        this.ID_CLASS_PREFIX + "guide-" + side, "hidden", "true");
+      this.getElement("guide-" + side).setAttribute("hidden", "true");
     }
   },
 
@@ -1382,26 +1380,26 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
    *         x or y co-ordinate. If this is undefined we hide the guide.
    */
   _updateGuide: function(side, point=-1) {
-    let guideId = this.ID_CLASS_PREFIX + "guide-" + side;
+    let guide = this.getElement("guide-" + side);
 
     if (point <= 0) {
-      this.markup.setAttributeForElement(guideId, "hidden", "true");
+      guide.setAttribute("hidden", "true");
       return false;
     }
 
     if (side === "top" || side === "bottom") {
-      this.markup.setAttributeForElement(guideId, "x1", "0");
-      this.markup.setAttributeForElement(guideId, "y1", point + "");
-      this.markup.setAttributeForElement(guideId, "x2", "100%");
-      this.markup.setAttributeForElement(guideId, "y2", point + "");
+      guide.setAttribute("x1", "0");
+      guide.setAttribute("y1", point + "");
+      guide.setAttribute("x2", "100%");
+      guide.setAttribute("y2", point + "");
     } else {
-      this.markup.setAttributeForElement(guideId, "x1", point + "");
-      this.markup.setAttributeForElement(guideId, "y1", "0");
-      this.markup.setAttributeForElement(guideId, "x2", point + "");
-      this.markup.setAttributeForElement(guideId, "y2", "100%");
+      guide.setAttribute("x1", point + "");
+      guide.setAttribute("y1", "0");
+      guide.setAttribute("x2", point + "");
+      guide.setAttribute("y2", "100%");
     }
 
-    this.markup.removeAttributeForElement(guideId, "hidden");
+    guide.removeAttribute("hidden");
 
     return true;
   },
@@ -1435,12 +1433,11 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
     let rect = this._getOuterQuad("border").bounds;
     let dim = parseFloat(rect.width.toPrecision(6)) + " \u00D7 " + parseFloat(rect.height.toPrecision(6));
 
-    let elementId = this.ID_CLASS_PREFIX + "nodeinfobar-";
-    this.markup.setTextContentForElement(elementId + "tagname", tagName);
-    this.markup.setTextContentForElement(elementId + "id", id);
-    this.markup.setTextContentForElement(elementId + "classes", classList);
-    this.markup.setTextContentForElement(elementId + "pseudo-classes", pseudos);
-    this.markup.setTextContentForElement(elementId + "dimensions", dim);
+    this.getElement("nodeinfobar-tagname").setTextContent(tagName);
+    this.getElement("nodeinfobar-id").setTextContent(id);
+    this.getElement("nodeinfobar-classes").setTextContent(classList);
+    this.getElement("nodeinfobar-pseudo-classes").setTextContent(pseudos);
+    this.getElement("nodeinfobar-dimensions").setTextContent(dim);
 
     this._moveInfobar();
   },
@@ -1457,7 +1454,7 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
     // showing tooltips outside the viewport.
     let containerBottom = Math.max(0, bounds.bottom) + NODE_INFOBAR_ARROW_SIZE;
     let containerTop = Math.min(winHeight, bounds.top);
-    let containerId = this.ID_CLASS_PREFIX + "nodeinfobar-container";
+    let container = this.getElement("nodeinfobar-container");
 
     // Can the bar be above the node?
     let top;
@@ -1466,16 +1463,16 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
       if (containerBottom + NODE_INFOBAR_HEIGHT > winHeight) {
         // No. Let's move it inside.
         top = containerTop;
-        this.markup.setAttributeForElement(containerId, "position", "overlap");
+        container.setAttribute("position", "overlap");
       } else {
         // Yes. Let's move it under the node.
         top = containerBottom;
-        this.markup.setAttributeForElement(containerId, "position", "bottom");
+        container.setAttribute("position", "bottom");
       }
     } else {
       // Yes. Let's move it on top of the node.
       top = containerTop - NODE_INFOBAR_HEIGHT;
-      this.markup.setAttributeForElement(containerId, "position", "top");
+      container.setAttribute("position", "top");
     }
 
     // Align the bar with the box's center if possible.
@@ -1484,16 +1481,16 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
     let buffer = 100;
     if (left < buffer) {
       left = buffer;
-      this.markup.setAttributeForElement(containerId, "hide-arrow", "true");
+      container.setAttribute("hide-arrow", "true");
     } else if (left > winWidth - buffer) {
       left = winWidth - buffer;
-      this.markup.setAttributeForElement(containerId, "hide-arrow", "true");
+      container.setAttribute("hide-arrow", "true");
     } else {
-      this.markup.removeAttributeForElement(containerId, "hide-arrow");
+      container.removeAttribute("hide-arrow");
     }
 
     let style = "top:" + top + "px;left:" + left + "px;";
-    this.markup.setAttributeForElement(containerId, "style", style);
+    container.setAttribute("style", style);
   }
 });
 register(BoxModelHighlighter);
@@ -1626,6 +1623,10 @@ CssTransformHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.proto
     this.markup.destroy();
   },
 
+  getElement: function(id) {
+    return this.markup.getElement(this.ID_CLASS_PREFIX + id);
+  },
+
   /**
    * Show the highlighter on a given node
    * @param {DOMNode} node
@@ -1652,23 +1653,21 @@ CssTransformHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.proto
     for (let point of ["p1","p2", "p3", "p4"]) {
       points.push(quad[point].x + "," + quad[point].y);
     }
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + id,
-                                       "points",
-                                       points.join(" "));
+    this.getElement(id).setAttribute("points", points.join(" "));
   },
 
   _setLinePoints: function(p1, p2, id) {
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + id, "x1", p1.x);
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + id, "y1", p1.y);
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + id, "x2", p2.x);
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + id, "y2", p2.y);
+    let line = this.getElement(id);
+    line.setAttribute("x1", p1.x);
+    line.setAttribute("y1", p1.y);
+    line.setAttribute("x2", p2.x);
+    line.setAttribute("y2", p2.y);
 
     let dist = Math.sqrt(Math.pow(p2.x - p1.x, 2) + Math.pow(p2.y - p1.y, 2));
     if (dist < ARROW_LINE_MIN_DISTANCE) {
-      this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + id, "marker-end");
+      line.removeAttribute("marker-end");
     } else {
-      this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + id, "marker-end",
-                                         "url(#" + this.markerId + ")");
+      line.setAttribute("marker-end", "url(#" + this.markerId + ")");
     }
   },
 
@@ -1717,13 +1716,11 @@ CssTransformHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.proto
   },
 
   _hideShapes: function() {
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "elements",
-      "hidden", "true");
+    this.getElement("elements").setAttribute("hidden", "true");
   },
 
   _showShapes: function() {
-    this.markup.removeAttributeForElement(this.ID_CLASS_PREFIX + "elements",
-      "hidden");
+    this.getElement("elements").removeAttribute("hidden");
   }
 });
 register(CssTransformHighlighter);
@@ -1830,6 +1827,10 @@ RectHighlighter.prototype = {
     this.markup.destroy();
   },
 
+  getElement: function(id) {
+    return this.markup.getElement(id);
+  },
+
   _hasValidOptions: function(options) {
     let isValidNb = n => typeof n === "number" && n >= 0 && isFinite(n);
     return options && options.rect &&
@@ -1875,12 +1876,13 @@ RectHighlighter.prototype = {
     }
 
     // Set the coordinates of the highlighter and show it
-    this.markup.setAttributeForElement("highlighted-rect", "style", style);
-    this.markup.removeAttributeForElement("highlighted-rect", "hidden");
+    let rect = this.getElement("highlighted-rect");
+    rect.setAttribute("style", style);
+    rect.removeAttribute("hidden");
   },
 
   hide: function() {
-    this.markup.setAttributeForElement("highlighted-rect", "hidden", "true");
+    this.getElement("highlighted-rect").setAttribute("hidden", "true");
   }
 };
 register(RectHighlighter);
@@ -2145,6 +2147,10 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
     this.offsetParent = null;
   },
 
+  getElement: function(id) {
+    return this.markup.getElement(this.ID_CLASS_PREFIX + id);
+  },
+
   /**
    * Get the list of geometry properties that are actually set on the current
    * node.
@@ -2271,7 +2277,7 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
     this.parentQuads = this.layoutHelpers
                       .getAdjustedQuads(this.offsetParent.element, "padding");
 
-    let el = this.markup.getElement(this.ID_CLASS_PREFIX + "offset-parent");
+    let el = this.getElement("offset-parent");
 
     let isPositioned = this.computedStyle.position === "absolute" ||
                        this.computedStyle.position === "fixed";
@@ -2308,7 +2314,7 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
   },
 
   updateCurrentNode: function() {
-    let box = this.markup.getElement(this.ID_CLASS_PREFIX + "current-node");
+    let box = this.getElement("current-node");
     let {p1, p2, p3, p4} = this.currentQuads.margin[0];
     let attr = p1.x + "," + p1.y + " " +
                p2.x + "," + p2.y + " " +
@@ -2321,9 +2327,8 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
   _hide: function() {
     setIgnoreLayoutChanges(true);
 
-    let id = this.ID_CLASS_PREFIX;
-    this.markup.setAttributeForElement(id + "current-node", "hidden", "true");
-    this.markup.setAttributeForElement(id + "offset-parent", "hidden", "true");
+    this.getElement("current-node").setAttribute("hidden", "true");
+    this.getElement("offset-parent").setAttribute("hidden", "true");
     this.hideArrows();
     this.hideSize();
 
@@ -2334,15 +2339,13 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
 
   hideArrows: function() {
     for (let side of GeoProp.SIDES) {
-      let id = this.ID_CLASS_PREFIX;
-      this.markup.setAttributeForElement(id + "arrow-" + side, "hidden", "true");
-      this.markup.setAttributeForElement(id + "label-" + side, "hidden", "true");
+      this.getElement("arrow-" + side).setAttribute("hidden", "true");
+      this.getElement("label-" + side).setAttribute("hidden", "true");
     }
   },
 
   hideSize: function() {
-    this.markup.setAttributeForElement(this.ID_CLASS_PREFIX + "label-size",
-      "hidden", "true");
+    this.getElement("label-size").setAttribute("hidden", "true");
   },
 
   updateSize: function() {
@@ -2360,9 +2363,8 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
     }
 
     if (labels.length) {
-      let id = this.ID_CLASS_PREFIX;
-      let labelEl = this.markup.getElement(id + "label-size");
-      let labelTextEl = this.markup.getElement(id + "label-text-size");
+      let labelEl = this.getElement("label-size");
+      let labelTextEl = this.getElement("label-text-size");
 
       let {bounds} = this.currentQuads.margin[0];
 
@@ -2440,10 +2442,9 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
   },
 
   updateArrow: function(side, mainStart, mainEnd, crossPos, labelValue) {
-    let id = this.ID_CLASS_PREFIX;
-    let arrowEl = this.markup.getElement(id + "arrow-" + side);
-    let labelEl = this.markup.getElement(id + "label-" + side);
-    let labelTextEl = this.markup.getElement(id + "label-text-" + side);
+    let arrowEl = this.getElement("arrow-" + side);
+    let labelEl = this.getElement("label-" + side);
+    let labelTextEl = this.getElement("label-text-" + side);
 
     // Position the arrow <line>.
     arrowEl.setAttribute(GeoProp.axis(side) + "1", mainStart);

From 8610c13659a3fa49f5f5d498aff43dc461645142 Mon Sep 17 00:00:00 2001
From: Jeremy Chen <jeremychen@mozilla.com>
Date: Mon, 16 Mar 2015 22:09:00 -0400
Subject: [PATCH 56/80] Bug 1140994 - Notify gaia to hide selection bubble when
 scrolling without APZ. r=roc

---
 layout/base/SelectionCarets.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/layout/base/SelectionCarets.cpp b/layout/base/SelectionCarets.cpp
index 80ec6a7967a4..f8bd1c4a0bd0 100644
--- a/layout/base/SelectionCarets.cpp
+++ b/layout/base/SelectionCarets.cpp
@@ -1196,6 +1196,11 @@ SelectionCarets::ScrollPositionChanged()
     if (!mUseAsyncPanZoom) {
       SetVisibility(false);
       //TODO: handling scrolling for selection bubble when APZ is off
+      // Dispatch event to notify gaia to hide selection bubble.
+      // Positions will be updated when scroll is end, so no need to calculate
+      // and keep scroll positions here. An arbitrary (0, 0) is sent instead.
+      DispatchScrollViewChangeEvent(mPresShell, dom::ScrollState::Started,
+                                    mozilla::CSSIntPoint(0, 0));
 
       SELECTIONCARETS_LOG("Launch scroll end detector");
       LaunchScrollEndDetector();

From 528865edc639fa96cf7b7bcdac372d3e06f766df Mon Sep 17 00:00:00 2001
From: Shawn Huang <shuang@mozilla.com>
Date: Wed, 18 Mar 2015 02:52:00 -0400
Subject: [PATCH 57/80] Bug 1142408 - Add data length parameter for Register
 Notification Response Command. r=tzimmermann

---
 .../BluetoothDaemonAvrcpInterface.cpp         |  5 +--
 .../bluedroid/BluetoothDaemonHelpers.h        | 31 +++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp b/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
index b8ee8f5afe70..d62fda1b6e65 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
@@ -265,8 +265,9 @@ BluetoothDaemonAvrcpModule::RegisterNotificationRspCmd(
                            1 + // Data length
                            256)); // Maximum data length
 
-  nsresult rv = PackPDU(aEvent, aType,
-                        BluetoothAvrcpEventParamPair(aEvent, aParam), *pdu);
+  BluetoothAvrcpEventParamPair data(aEvent, aParam);
+  nsresult rv = PackPDU(aEvent, aType, static_cast<uint8_t>(data.GetLength()),
+                        data, *pdu);
   if (NS_FAILED(rv)) {
     return rv;
   }
diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
index ca012f3602f4..b98e060cdde5 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonHelpers.h
@@ -85,6 +85,37 @@ struct BluetoothAvrcpEventParamPair {
     , mParam(aParam)
   { }
 
+  size_t GetLength()
+  {
+    size_t size;
+
+    switch(mEvent) {
+      case AVRCP_EVENT_PLAY_STATUS_CHANGED:
+        /* PackPDU casts ControlPlayStatus to uint8_t */
+        size = sizeof(static_cast<uint8_t>(mParam.mPlayStatus));
+        break;
+      case AVRCP_EVENT_TRACK_CHANGE:
+        size = sizeof(mParam.mTrack);
+        break;
+      case AVRCP_EVENT_TRACK_REACHED_END:
+      case AVRCP_EVENT_TRACK_REACHED_START:
+        /* no data to pack */
+        size = 0;
+        break;
+      case AVRCP_EVENT_PLAY_POS_CHANGED:
+        size = sizeof(mParam.mSongPos);
+        break;
+      case AVRCP_EVENT_APP_SETTINGS_CHANGED:
+        size = (sizeof(mParam.mIds[0]) + sizeof(mParam.mValues[0])) * mParam.mNumAttr;
+        break;
+      default:
+        size = 0;
+        break;
+    }
+
+    return size;
+  }
+
   BluetoothAvrcpEvent mEvent;
   const BluetoothAvrcpNotificationParam& mParam;
 };

From d402c5c8999e7e24446a685d56a5ad6bdbce67e4 Mon Sep 17 00:00:00 2001
From: Patrick Brosset <pbrosset@mozilla.com>
Date: Fri, 20 Mar 2015 16:58:50 +0100
Subject: [PATCH 58/80] Bug 1139186 - 2 - Add event handling support to
 CanvasFrameAnonymousContentHelper; r=bgrins

--HG--
extra : rebase_source : 2174e1f43bad5ca10a7d1ac233a0d4ff813d7464
extra : histedit_source : 161c967641af855e13626a63b8dbf8f039ed5d0f%2C3066228d0737dcb415cf39f8e707df46afa9b45e
---
 toolkit/devtools/LayoutHelpers.jsm            |   7 +-
 .../devtools/server/actors/highlighter.css    |  13 +-
 toolkit/devtools/server/actors/highlighter.js | 156 ++++++++++++++++--
 .../devtools/server/tests/browser/browser.ini |   6 +
 .../browser/browser_canvasframe_helper_01.js  |  82 +++++++++
 .../browser/browser_canvasframe_helper_02.js  |  38 +++++
 .../browser/browser_canvasframe_helper_03.js  |  93 +++++++++++
 .../browser/browser_canvasframe_helper_04.js  |  93 +++++++++++
 .../browser/browser_canvasframe_helper_05.js  | 101 ++++++++++++
 .../browser/browser_canvasframe_helper_06.js  |  89 ++++++++++
 toolkit/devtools/server/tests/browser/head.js |  14 ++
 11 files changed, 676 insertions(+), 16 deletions(-)
 create mode 100644 toolkit/devtools/server/tests/browser/browser_canvasframe_helper_01.js
 create mode 100644 toolkit/devtools/server/tests/browser/browser_canvasframe_helper_02.js
 create mode 100644 toolkit/devtools/server/tests/browser/browser_canvasframe_helper_03.js
 create mode 100644 toolkit/devtools/server/tests/browser/browser_canvasframe_helper_04.js
 create mode 100644 toolkit/devtools/server/tests/browser/browser_canvasframe_helper_05.js
 create mode 100644 toolkit/devtools/server/tests/browser/browser_canvasframe_helper_06.js

diff --git a/toolkit/devtools/LayoutHelpers.jsm b/toolkit/devtools/LayoutHelpers.jsm
index cc4bae2fa9ee..7b82e844da1b 100644
--- a/toolkit/devtools/LayoutHelpers.jsm
+++ b/toolkit/devtools/LayoutHelpers.jsm
@@ -604,12 +604,13 @@ LayoutHelpers.isShadowAnonymous = function(node) {
  * Container windows are used as a weakmap key to store the corresponding
  * nsIDOMWindowUtils instance to avoid querying it every time.
  *
- * @param {DOMNode} The node for which the zoom factor should be calculated
+ * @param {DOMNode|DOMWindow} The node for which the zoom factor should be
+ * calculated, or its owner window.
  * @return {Number}
  */
 let windowUtils = new WeakMap;
-LayoutHelpers.getCurrentZoom = function(node, map = z=>z) {
-  let win = node.ownerDocument.defaultView;
+LayoutHelpers.getCurrentZoom = function(node) {
+  let win = node.self === node ? node : node.ownerDocument.defaultView;
   let utils = windowUtils.get(win);
   if (utils) {
     return utils.fullZoom;
diff --git a/toolkit/devtools/server/actors/highlighter.css b/toolkit/devtools/server/actors/highlighter.css
index fac5751a168b..172d0c89db07 100644
--- a/toolkit/devtools/server/actors/highlighter.css
+++ b/toolkit/devtools/server/actors/highlighter.css
@@ -14,10 +14,15 @@
 */
 
 :-moz-native-anonymous .highlighter-container {
-  pointer-events: none;
   position: absolute;
   width: 100%;
   height: 100%;
+  /* The container for all highlighters doesn't react to pointer-events by
+     default. This is because most highlighters cover the whole viewport but
+     don't contain UIs that need to be accessed.
+     If your highlighter has UI that needs to be interacted with, add
+     'pointer-events:auto;' on its container element. */
+  pointer-events: none;
 }
 
 :-moz-native-anonymous .highlighter-container [hidden] {
@@ -181,6 +186,12 @@
 
 /* Element geometry highlighter */
 
+:-moz-native-anonymous .geometry-editor-root {
+  /* The geometry editor can be interacted with, so it needs to react to
+     pointer events */
+  pointer-events: auto;
+}
+
 :-moz-native-anonymous .geometry-editor-offset-parent {
   stroke: #08c;
   shape-rendering: crispEdges;
diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js
index 5a07a106d14a..b4a63938dfda 100644
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -125,6 +125,7 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
     this._highlighterHidden = this._highlighterHidden.bind(this);
     this._onNavigate = this._onNavigate.bind(this);
 
+    this._layoutHelpers = new LayoutHelpers(this._tabActor.window);
     this._createHighlighter();
 
     // Listen to navigation events to switch from the BoxModelHighlighter to the
@@ -179,6 +180,7 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
     this._inspector = null;
     this._walker = null;
     this._tabActor = null;
+    this._layoutHelpers = null;
   },
 
   /**
@@ -512,8 +514,12 @@ function CanvasFrameAnonymousContentHelper(tabActor, nodeBuilder) {
 
   this._onNavigate = this._onNavigate.bind(this);
   events.on(this.tabActor, "navigate", this._onNavigate);
+
+  this.listeners = new Map();
 }
 
+exports.CanvasFrameAnonymousContentHelper = CanvasFrameAnonymousContentHelper;
+
 CanvasFrameAnonymousContentHelper.prototype = {
   destroy: function() {
     // If the current window isn't the one the content was inserted into, this
@@ -526,6 +532,8 @@ CanvasFrameAnonymousContentHelper.prototype = {
     this.tabActor = this.nodeBuilder = this._content = null;
     this.anonymousContentDocument = null;
     this.anonymousContentGlobal = null;
+
+    this._removeAllListeners();
   },
 
   _insert: function() {
@@ -562,7 +570,9 @@ CanvasFrameAnonymousContentHelper.prototype = {
 
   _onNavigate: function({isTopLevel}) {
     if (isTopLevel) {
+      this._removeAllListeners();
       this._insert();
+      this.anonymousContentDocument = this.tabActor.window.document;
     }
   },
 
@@ -598,6 +608,129 @@ CanvasFrameAnonymousContentHelper.prototype = {
     }
   },
 
+  /**
+   * Add an event listener to one of the elements inserted in the canvasFrame
+   * native anonymous container.
+   * Like other methods in this helper, this requires the ID of the element to
+   * be passed in.
+   *
+   * Note that if the content page navigates, the event listeners won't be
+   * added again.
+   *
+   * Also note that unlike traditional DOM events, the events handled by
+   * listeners added here will propagate through the document only through
+   * bubbling phase, so the useCapture parameter isn't supported.
+   * It is possible however to call e.stopPropagation() to stop the bubbling.
+   *
+   * IMPORTANT: the chrome-only canvasFrame insertion API takes great care of
+   * not leaking references to inserted elements to chrome JS code. That's
+   * because otherwise, chrome JS code could freely modify native anon elements
+   * inside the canvasFrame and probably change things that are assumed not to
+   * change by the C++ code managing this frame.
+   * See https://wiki.mozilla.org/DevTools/Highlighter#The_AnonymousContent_API
+   * Unfortunately, the inserted nodes are still available via
+   * event.originalTarget, and that's what the event handler here uses to check
+   * that the event actually occured on the right element, but that also means
+   * consumers of this code would be able to access the inserted elements.
+   * Therefore, the originalTarget property will be nullified before the event
+   * is passed to your handler.
+   *
+   * IMPL DETAIL: A single event listener is added per event types only, at
+   * browser level and if the event originalTarget is found to have the provided
+   * ID, the callback is executed (and then IDs of parent nodes of the
+   * originalTarget are checked too).
+   *
+   * @param {String} id
+   * @param {String} type
+   * @param {Function} handler
+   */
+  addEventListenerForElement: function(id, type, handler) {
+    if (typeof id !== "string") {
+      throw new Error("Expected a string ID in addEventListenerForElement but" +
+        " got: " + id);
+    }
+
+    // If no one is listening for this type of event yet, add one listener.
+    if (!this.listeners.has(type)) {
+      let target = getPageListenerTarget(this.tabActor);
+      target.addEventListener(type, this, true);
+      // Each type entry in the map is a map of ids:handlers.
+      this.listeners.set(type, new Map);
+    }
+
+    let listeners = this.listeners.get(type);
+    listeners.set(id, handler);
+  },
+
+  /**
+   * Remove an event listener from one of the elements inserted in the
+   * canvasFrame native anonymous container.
+   * @param {String} id
+   * @param {String} type
+   * @param {Function} handler
+   */
+  removeEventListenerForElement: function(id, type, handler) {
+    let listeners = this.listeners.get(type);
+    if (!listeners) {
+      return;
+    }
+    listeners.delete(id);
+
+    // If no one is listening for event type anymore, remove the listener.
+    if (!this.listeners.has(type)) {
+      let target = getPageListenerTarget(this.tabActor);
+      target.removeEventListener(type, this, true);
+    }
+  },
+
+  handleEvent: function(event) {
+    let listeners = this.listeners.get(event.type);
+    if (!listeners) {
+      return;
+    }
+
+    // Hide the originalTarget property to avoid exposing references to native
+    // anonymous elements. See addEventListenerForElement's comment.
+    let isPropagationStopped = false;
+    let eventProxy = new Proxy(event, {
+      get: (obj, name) => {
+        if (name === "originalTarget") {
+          return null;
+        } else if (name === "stopPropagation") {
+          return () => {
+            isPropagationStopped = true;
+          };
+        } else {
+          return obj[name];
+        }
+      }
+    });
+
+    // Start at originalTarget, bubble through ancestors and call handlers when
+    // needed.
+    let node = event.originalTarget;
+    while (node) {
+      let handler = listeners.get(node.id);
+      if (handler) {
+        handler(eventProxy, node.id);
+        if (isPropagationStopped) {
+          break;
+        }
+      }
+      node = node.parentNode;
+    }
+  },
+
+  _removeAllListeners: function() {
+    if (this.tabActor) {
+      let target = getPageListenerTarget(this.tabActor);
+      for (let [type] of this.listeners) {
+        target.removeEventListener(type, this, true);
+      }
+    }
+    this.listeners.clear();
+  },
+
   getElement: function(id) {
     let self = this;
     return {
@@ -605,7 +738,13 @@ CanvasFrameAnonymousContentHelper.prototype = {
       setTextContent: text => self.setTextContentForElement(id, text),
       setAttribute: (name, value) => self.setAttributeForElement(id, name, value),
       getAttribute: name => self.getAttributeForElement(id, name),
-      removeAttribute: name => self.removeAttributeForElement(id, name)
+      removeAttribute: name => self.removeAttributeForElement(id, name),
+      addEventListener: (type, handler) => {
+        return self.addEventListenerForElement(id, type, handler);
+      },
+      removeEventListener: (type, handler) => {
+        return self.removeEventListenerForElement(id, type, handler);
+      }
     };
   },
 
@@ -904,11 +1043,6 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
 
   ID_CLASS_PREFIX: "box-model-",
 
-  get zoom() {
-    return this.win.QueryInterface(Ci.nsIInterfaceRequestor)
-               .getInterface(Ci.nsIDOMWindowUtils).fullZoom;
-  },
-
   get currentNode() {
     return this._currentNode;
   },
@@ -943,7 +1077,6 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
         "id": "elements",
         "width": "100%",
         "height": "100%",
-        "style": "width:100%;height:100%;",
         "hidden": "true"
       },
       prefix: this.ID_CLASS_PREFIX
@@ -1447,8 +1580,8 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype
    */
   _moveInfobar: function() {
     let bounds = this._getOuterBounds();
-    let winHeight = this.win.innerHeight * this.zoom;
-    let winWidth = this.win.innerWidth * this.zoom;
+    let winHeight = this.win.innerHeight * LayoutHelpers.getCurrentZoom(this.win);
+    let winWidth = this.win.innerWidth * LayoutHelpers.getCurrentZoom(this.win);
 
     // Ensure that containerBottom and containerTop are at least zero to avoid
     // showing tooltips outside the viewport.
@@ -1726,7 +1859,6 @@ CssTransformHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.proto
 register(CssTransformHighlighter);
 exports.CssTransformHighlighter = CssTransformHighlighter;
 
-
 /**
  * The SelectorHighlighter runs a given selector through querySelectorAll on the
  * document of the provided context node and then uses the BoxModelHighlighter
@@ -1739,6 +1871,7 @@ function SelectorHighlighter(tabActor) {
 
 SelectorHighlighter.prototype = {
   typeName: "SelectorHighlighter",
+
   /**
    * Show BoxModelHighlighter on each node that matches that provided selector.
    * @param {DOMNode} node A context node that is used to get the document on
@@ -2002,8 +2135,7 @@ GeometryEditorHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.pro
       attributes: {
         "id": "elements",
         "width": "100%",
-        "height": "100%",
-        "style": "width:100%;height:100%;"
+        "height": "100%"
       },
       prefix: this.ID_CLASS_PREFIX
     });
diff --git a/toolkit/devtools/server/tests/browser/browser.ini b/toolkit/devtools/server/tests/browser/browser.ini
index 73bfec6d3f58..37223a37b3d5 100644
--- a/toolkit/devtools/server/tests/browser/browser.ini
+++ b/toolkit/devtools/server/tests/browser/browser.ini
@@ -26,6 +26,12 @@ support-files =
 [browser_animation_actors_09.js]
 [browser_animation_actors_10.js]
 [browser_animation_actors_11.js]
+[browser_canvasframe_helper_01.js]
+[browser_canvasframe_helper_02.js]
+[browser_canvasframe_helper_03.js]
+[browser_canvasframe_helper_04.js]
+[browser_canvasframe_helper_05.js]
+[browser_canvasframe_helper_06.js]
 [browser_navigateEvents.js]
 [browser_storage_dynamic_windows.js]
 [browser_storage_listings.js]
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_01.js b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_01.js
new file mode 100644
index 000000000000..2b765a9efe87
--- /dev/null
+++ b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_01.js
@@ -0,0 +1,82 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Simple CanvasFrameAnonymousContentHelper tests.
+
+// This makes sure the 'domnode' protocol actor type is known when importing
+// highlighter.
+require("devtools/server/actors/inspector");
+const {CanvasFrameAnonymousContentHelper} = require("devtools/server/actors/highlighter");
+const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
+
+add_task(function*() {
+  let doc = yield addTab(TEST_URL);
+
+  let nodeBuilder = () => {
+    let root = doc.createElement("div");
+    let child = doc.createElement("div");
+    child.style = "width:200px;height:200px;background:red;";
+    child.id = "child-element";
+    child.className = "child-element";
+    child.textContent = "test element";
+    root.appendChild(child);
+    return root;
+  };
+
+  info("Building the helper");
+  let helper = new CanvasFrameAnonymousContentHelper(
+    getMockTabActor(doc.defaultView), nodeBuilder);
+
+  ok(helper.content instanceof AnonymousContent,
+    "The helper owns the AnonymousContent object");
+  ok(helper.getTextContentForElement,
+    "The helper has the getTextContentForElement method");
+  ok(helper.setTextContentForElement,
+    "The helper has the setTextContentForElement method");
+  ok(helper.setAttributeForElement,
+    "The helper has the setAttributeForElement method");
+  ok(helper.getAttributeForElement,
+    "The helper has the getAttributeForElement method");
+  ok(helper.removeAttributeForElement,
+    "The helper has the removeAttributeForElement method");
+  ok(helper.addEventListenerForElement,
+    "The helper has the addEventListenerForElement method");
+  ok(helper.removeEventListenerForElement,
+    "The helper has the removeEventListenerForElement method");
+  ok(helper.getElement,
+    "The helper has the getElement method");
+  ok(helper.scaleRootElement,
+    "The helper has the scaleRootElement method");
+
+  is(helper.getTextContentForElement("child-element"), "test element",
+    "The text content was retrieve correctly");
+  is(helper.getAttributeForElement("child-element", "id"), "child-element",
+    "The ID attribute was retrieve correctly");
+  is(helper.getAttributeForElement("child-element", "class"), "child-element",
+    "The class attribute was retrieve correctly");
+
+  let el = helper.getElement("child-element");
+  ok(el, "The DOMNode-like element was created");
+
+  is(el.getTextContent(), "test element",
+    "The text content was retrieve correctly");
+  is(el.getAttribute("id"), "child-element",
+    "The ID attribute was retrieve correctly");
+  is(el.getAttribute("class"), "child-element",
+    "The class attribute was retrieve correctly");
+
+  info("Destroying the helper");
+  helper.destroy();
+
+  ok(!helper.getTextContentForElement("child-element"),
+    "No text content was retrieved after the helper was destroyed");
+  ok(!helper.getAttributeForElement("child-element", "id"),
+    "No ID attribute was retrieved after the helper was destroyed");
+  ok(!helper.getAttributeForElement("child-element", "class"),
+    "No class attribute was retrieved after the helper was destroyed");
+
+  gBrowser.removeCurrentTab();
+});
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_02.js b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_02.js
new file mode 100644
index 000000000000..e0ce0956c616
--- /dev/null
+++ b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_02.js
@@ -0,0 +1,38 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test that the CanvasFrameAnonymousContentHelper does not insert content in
+// XUL windows.
+
+// This makes sure the 'domnode' protocol actor type is known when importing
+// highlighter.
+require("devtools/server/actors/inspector");
+const {CanvasFrameAnonymousContentHelper} = require("devtools/server/actors/highlighter");
+
+add_task(function*() {
+  let doc = yield addTab("about:preferences");
+
+  let nodeBuilder = () => {
+    let root = doc.createElement("div");
+    let child = doc.createElement("div");
+    child.style = "width:200px;height:200px;background:red;";
+    child.id = "child-element";
+    child.className = "child-element";
+    child.textContent = "test element";
+    root.appendChild(child);
+    return root;
+  };
+
+  info("Building the helper");
+  let helper = new CanvasFrameAnonymousContentHelper(
+    getMockTabActor(doc.defaultView), nodeBuilder);
+
+  ok(!helper.content, "The AnonymousContent was not inserted in the window");
+  ok(!helper.getTextContentForElement("child-element"),
+    "No text content is returned");
+
+  gBrowser.removeCurrentTab();
+});
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_03.js b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_03.js
new file mode 100644
index 000000000000..27add7787d48
--- /dev/null
+++ b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_03.js
@@ -0,0 +1,93 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test the CanvasFrameAnonymousContentHelper event handling mechanism.
+
+// This makes sure the 'domnode' protocol actor type is known when importing
+// highlighter.
+require("devtools/server/actors/inspector");
+const {CanvasFrameAnonymousContentHelper} = require("devtools/server/actors/highlighter");
+const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
+
+add_task(function*() {
+  let doc = yield addTab(TEST_URL);
+
+  let nodeBuilder = () => {
+    let root = doc.createElement("div");
+    let child = doc.createElement("div");
+    child.style = "pointer-events:auto;width:200px;height:200px;background:red;";
+    child.id = "child-element";
+    child.className = "child-element";
+    root.appendChild(child);
+    return root;
+  };
+
+  info("Building the helper");
+  let helper = new CanvasFrameAnonymousContentHelper(
+    getMockTabActor(doc.defaultView), nodeBuilder);
+
+  let el = helper.getElement("child-element");
+
+  info("Adding an event listener on the inserted element");
+  let mouseDownHandled = 0;
+  function onMouseDown(e, id) {
+    is(id, "child-element", "The mousedown event was triggered on the element");
+    ok(!e.originalTarget, "The originalTarget property isn't available");
+    mouseDownHandled ++;
+  }
+  el.addEventListener("mousedown", onMouseDown);
+
+  info("Synthesizing an event on the inserted element");
+  let onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled, 1, "The mousedown event was handled once on the element");
+
+  info("Synthesizing an event somewhere else");
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(400, 400, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled, 1, "The mousedown event was not handled on the element");
+
+  info("Removing the event listener");
+  el.removeEventListener("mousedown", onMouseDown);
+
+  info("Synthesizing another event after the listener has been removed");
+  // Using a document event listener to know when the event has been synthesized.
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled, 1,
+    "The mousedown event hasn't been handled after the listener was removed");
+
+  info("Adding again the event listener");
+  el.addEventListener("mousedown", onMouseDown);
+
+  info("Destroying the helper");
+  helper.destroy();
+
+  info("Synthesizing another event after the helper has been destroyed");
+  // Using a document event listener to know when the event has been synthesized.
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled, 1,
+    "The mousedown event hasn't been handled after the helper was destroyed");
+
+  gBrowser.removeCurrentTab();
+});
+
+function synthesizeMouseDown(x, y, win) {
+  // We need to make sure the inserted anonymous content can be targeted by the
+  // event right after having been inserted, and so we need to force a sync
+  // reflow.
+  let forceReflow = win.document.documentElement.offsetWidth;
+  EventUtils.synthesizeMouseAtPoint(x, y, {type: "mousedown"}, win);
+}
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_04.js b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_04.js
new file mode 100644
index 000000000000..c04c3b7dce48
--- /dev/null
+++ b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_04.js
@@ -0,0 +1,93 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test the CanvasFrameAnonymousContentHelper re-inserts the content when the
+// page reloads.
+
+// This makes sure the 'domnode' protocol actor type is known when importing
+// highlighter.
+require("devtools/server/actors/inspector");
+const {CanvasFrameAnonymousContentHelper} = require("devtools/server/actors/highlighter");
+const events = require("sdk/event/core");
+const TEST_URL_1 = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test 1";
+const TEST_URL_2 = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test 2";
+
+add_task(function*() {
+  let doc = yield addTab(TEST_URL_2);
+
+  let tabActor = getMockTabActor(doc.defaultView);
+
+  let nodeBuilder = () => {
+    let root = doc.createElement("div");
+    let child = doc.createElement("div");
+    child.style = "pointer-events:auto;width:200px;height:200px;background:red;";
+    child.id = "child-element";
+    child.className = "child-element";
+    child.textContent= "test content";
+    root.appendChild(child);
+    return root;
+  };
+
+  info("Building the helper");
+  let helper = new CanvasFrameAnonymousContentHelper(tabActor, nodeBuilder);
+
+  info("Get an element from the helper");
+  let el = helper.getElement("child-element");
+
+  info("Try to access the element");
+  is(el.getAttribute("class"), "child-element",
+    "The attribute is correct before navigation");
+  is(el.getTextContent(), "test content",
+    "The text content is correct before navigation");
+
+  info("Add an event listener on the element");
+  let mouseDownHandled = 0;
+  function onMouseDown(e, id) {
+    is(id, "child-element", "The mousedown event was triggered on the element");
+    mouseDownHandled ++;
+  }
+  el.addEventListener("mousedown", onMouseDown);
+
+  info("Synthesizing an event on the element");
+  let onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+  is(mouseDownHandled, 1, "The mousedown event was handled once before navigation");
+
+  info("Navigating to a new page");
+  let loaded = once(gBrowser.selectedBrowser, "load", true);
+  content.location = TEST_URL_2;
+  yield loaded;
+  doc = gBrowser.selectedBrowser.contentWindow.document;
+
+  info("And faking the 'navigate' event on the tabActor");
+  events.emit(tabActor, "navigate", tabActor);
+
+  info("Try to access the element again");
+  is(el.getAttribute("class"), "child-element",
+    "The attribute is correct after navigation");
+  is(el.getTextContent(), "test content",
+    "The text content is correct after navigation");
+
+  info("Synthesizing an event on the element again");
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+  is(mouseDownHandled, 1, "The mousedown event was not handled after navigation");
+
+  info("Destroying the helper");
+  helper.destroy();
+
+  gBrowser.removeCurrentTab();
+});
+
+function synthesizeMouseDown(x, y, win) {
+  // We need to make sure the inserted anonymous content can be targeted by the
+  // event right after having been inserted, and so we need to force a sync
+  // reflow.
+  let forceReflow = win.document.documentElement.offsetWidth;
+  EventUtils.synthesizeMouseAtPoint(x, y, {type: "mousedown"}, win);
+}
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_05.js b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_05.js
new file mode 100644
index 000000000000..277ba8b2b0ec
--- /dev/null
+++ b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_05.js
@@ -0,0 +1,101 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test some edge cases of the CanvasFrameAnonymousContentHelper event handling
+// mechanism.
+
+// This makes sure the 'domnode' protocol actor type is known when importing
+// highlighter.
+require("devtools/server/actors/inspector");
+const {CanvasFrameAnonymousContentHelper} = require("devtools/server/actors/highlighter");
+const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
+
+add_task(function*() {
+  let doc = yield addTab(TEST_URL);
+
+  let nodeBuilder = () => {
+    let root = doc.createElement("div");
+
+    let parent = doc.createElement("div");
+    parent.style = "pointer-events:auto;width:300px;height:300px;background:yellow;";
+    parent.id = "parent-element";
+    root.appendChild(parent);
+
+    let child = doc.createElement("div");
+    child.style = "pointer-events:auto;width:200px;height:200px;background:red;";
+    child.id = "child-element";
+    parent.appendChild(child);
+
+    return root;
+  };
+
+  info("Building the helper");
+  let helper = new CanvasFrameAnonymousContentHelper(
+    getMockTabActor(doc.defaultView), nodeBuilder);
+
+  info("Getting the parent and child elements");
+  let parentEl = helper.getElement("parent-element");
+  let childEl = helper.getElement("child-element");
+
+  info("Adding an event listener on both elements");
+  let mouseDownHandled = [];
+  function onMouseDown(e, id) {
+    mouseDownHandled.push(id);
+  }
+  parentEl.addEventListener("mousedown", onMouseDown);
+  childEl.addEventListener("mousedown", onMouseDown);
+
+  info("Synthesizing an event on the child element");
+  let onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled.length, 2, "The mousedown event was handled twice");
+  is(mouseDownHandled[0], "child-element",
+    "The mousedown event was handled on the child element");
+  is(mouseDownHandled[1], "parent-element",
+    "The mousedown event was handled on the parent element");
+
+  info("Synthesizing an event on the parent, outside of the child element");
+  mouseDownHandled = [];
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(250, 250, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled.length, 1, "The mousedown event was handled only once");
+  is(mouseDownHandled[0], "parent-element",
+    "The mousedown event was handled on the parent element");
+
+  info("Removing the event listener");
+  parentEl.removeEventListener("mousedown", onMouseDown);
+  childEl.removeEventListener("mousedown", onMouseDown);
+
+  info("Adding an event listener on the parent element only");
+  mouseDownHandled = [];
+  parentEl.addEventListener("mousedown", onMouseDown);
+
+  info("Synthesizing an event on the child element");
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled.length, 1, "The mousedown event was handled once");
+  is(mouseDownHandled[0], "parent-element",
+    "The mousedown event did bubble to the parent element");
+
+  info("Removing the parent listener");
+  parentEl.removeEventListener("mousedown", onMouseDown);
+
+  gBrowser.removeCurrentTab();
+});
+
+function synthesizeMouseDown(x, y, win) {
+  // We need to make sure the inserted anonymous content can be targeted by the
+  // event right after having been inserted, and so we need to force a sync
+  // reflow.
+  let forceReflow = win.document.documentElement.offsetWidth;
+  EventUtils.synthesizeMouseAtPoint(x, y, {type: "mousedown"}, win);
+}
diff --git a/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_06.js b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_06.js
new file mode 100644
index 000000000000..2a857e7eefe5
--- /dev/null
+++ b/toolkit/devtools/server/tests/browser/browser_canvasframe_helper_06.js
@@ -0,0 +1,89 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test support for event propagation stop in the
+// CanvasFrameAnonymousContentHelper event handling mechanism.
+
+// This makes sure the 'domnode' protocol actor type is known when importing
+// highlighter.
+require("devtools/server/actors/inspector");
+const {CanvasFrameAnonymousContentHelper} = require("devtools/server/actors/highlighter");
+const TEST_URL = "data:text/html;charset=utf-8,CanvasFrameAnonymousContentHelper test";
+
+add_task(function*() {
+  let doc = yield addTab(TEST_URL);
+
+  let nodeBuilder = () => {
+    let root = doc.createElement("div");
+
+    let parent = doc.createElement("div");
+    parent.style = "pointer-events:auto;width:300px;height:300px;background:yellow;";
+    parent.id = "parent-element";
+    root.appendChild(parent);
+
+    let child = doc.createElement("div");
+    child.style = "pointer-events:auto;width:200px;height:200px;background:red;";
+    child.id = "child-element";
+    parent.appendChild(child);
+
+    return root;
+  };
+
+  info("Building the helper");
+  let helper = new CanvasFrameAnonymousContentHelper(
+    getMockTabActor(doc.defaultView), nodeBuilder);
+
+  info("Getting the parent and child elements");
+  let parentEl = helper.getElement("parent-element");
+  let childEl = helper.getElement("child-element");
+
+  info("Adding an event listener on both elements");
+  let mouseDownHandled = [];
+
+  function onParentMouseDown(e, id) {
+    mouseDownHandled.push(id);
+  }
+  parentEl.addEventListener("mousedown", onParentMouseDown);
+
+  function onChildMouseDown(e, id) {
+    mouseDownHandled.push(id);
+    e.stopPropagation();
+  }
+  childEl.addEventListener("mousedown", onChildMouseDown);
+
+  info("Synthesizing an event on the child element");
+  let onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(100, 100, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled.length, 1, "The mousedown event was handled only once");
+  is(mouseDownHandled[0], "child-element",
+    "The mousedown event was handled on the child element");
+
+  info("Synthesizing an event on the parent, outside of the child element");
+  mouseDownHandled = [];
+  onDocMouseDown = once(doc, "mousedown");
+  synthesizeMouseDown(250, 250, doc.defaultView);
+  yield onDocMouseDown;
+
+  is(mouseDownHandled.length, 1, "The mousedown event was handled only once");
+  is(mouseDownHandled[0], "parent-element",
+    "The mousedown event was handled on the parent element");
+
+  info("Removing the event listener");
+  parentEl.removeEventListener("mousedown", onParentMouseDown);
+  childEl.removeEventListener("mousedown", onChildMouseDown);
+
+  gBrowser.removeCurrentTab();
+});
+
+function synthesizeMouseDown(x, y, win) {
+  // We need to make sure the inserted anonymous content can be targeted by the
+  // event right after having been inserted, and so we need to force a sync
+  // reflow.
+  let forceReflow = win.document.documentElement.offsetWidth;
+  EventUtils.synthesizeMouseAtPoint(x, y, {type: "mousedown"}, win);
+}
diff --git a/toolkit/devtools/server/tests/browser/head.js b/toolkit/devtools/server/tests/browser/head.js
index 774d1f66f2de..f2a927d51f89 100644
--- a/toolkit/devtools/server/tests/browser/head.js
+++ b/toolkit/devtools/server/tests/browser/head.js
@@ -118,6 +118,20 @@ function forceCollections() {
   Cu.forceShrinkingGC();
 }
 
+/**
+ * Get a mock tabActor from a given window.
+ * This is sometimes useful to test actors or classes that use the tabActor in
+ * isolation.
+ * @param {DOMWindow} win
+ * @return {Object}
+ */
+function getMockTabActor(win) {
+  return {
+    window: win,
+    isRootActor: true
+  };
+}
+
 registerCleanupFunction(function tearDown() {
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();

From 2138860ac1f5c226c140b89489a47ce11a278e99 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Wed, 18 Mar 2015 18:36:23 -0700
Subject: [PATCH 59/80] Bug 1144245 - Add a LoginTestUtils.jsm module. r=MattN

--HG--
rename : toolkit/components/passwordmgr/test/unit/head.js => toolkit/components/passwordmgr/test/LoginTestUtils.jsm
---
 toolkit/components/passwordmgr/moz.build      |   4 +
 .../passwordmgr/test/LoginTestUtils.jsm       | 239 +++++++++++++++++
 .../components/passwordmgr/test/unit/head.js  | 251 +-----------------
 3 files changed, 250 insertions(+), 244 deletions(-)
 create mode 100644 toolkit/components/passwordmgr/test/LoginTestUtils.jsm

diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build
index 5cca6632c4f5..22576bfac119 100644
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -9,6 +9,10 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
+TESTING_JS_MODULES += [
+    'test/LoginTestUtils.jsm',
+]
+
 XPIDL_SOURCES += [
     'nsILoginInfo.idl',
     'nsILoginManager.idl',
diff --git a/toolkit/components/passwordmgr/test/LoginTestUtils.jsm b/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
new file mode 100644
index 000000000000..f1b67c6de87b
--- /dev/null
+++ b/toolkit/components/passwordmgr/test/LoginTestUtils.jsm
@@ -0,0 +1,239 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * Shared functions generally available for testing login components.
+ */
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = [
+  "LoginTestUtils",
+];
+
+const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+
+Cu.import("resource://gre/modules/Promise.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+Cu.import("resource://testing-common/TestUtils.jsm");
+
+const LoginInfo =
+      Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
+                             "nsILoginInfo", "init");
+
+// For now, we need consumers to provide a reference to Assert.jsm.
+let Assert = null;
+
+this.LoginTestUtils = {
+  set Assert(assert) {
+    Assert = assert;
+  },
+
+  /**
+   * Forces the storage module to save all data, and the Login Manager service
+   * to replace the storage module with a newly initialized instance.
+   */
+  reloadData() {
+    Services.obs.notifyObservers(null, "passwordmgr-storage-replace", null);
+    yield TestUtils.topicObserved("passwordmgr-storage-replace-complete");
+  },
+
+  /**
+   * Erases all the data stored by the Login Manager service.
+   */
+  clearData() {
+    Services.logins.removeAllLogins();
+    for (let hostname of Services.logins.getAllDisabledHosts()) {
+      Services.logins.setLoginSavingEnabled(hostname, true);
+    }
+  },
+
+  /**
+   * Checks that the currently stored list of nsILoginInfo matches the provided
+   * array.  The comparison uses the "equals" method of nsILoginInfo, that does
+   * not include nsILoginMetaInfo properties in the test.
+   */
+  checkLogins(expectedLogins) {
+    this.assertLoginListsEqual(Services.logins.getAllLogins(), expectedLogins);
+  },
+
+  /**
+   * Checks that the two provided arrays of nsILoginInfo have the same length,
+   * and every login in "expected" is also found in "actual".  The comparison
+   * uses the "equals" method of nsILoginInfo, that does not include
+   * nsILoginMetaInfo properties in the test.
+   */
+  assertLoginListsEqual(actual, expected) {
+    Assert.equal(expected.length, actual.length);
+    Assert.ok(expected.every(e => actual.some(a => a.equals(e))));
+  },
+
+  /**
+   * Checks that the two provided arrays of strings contain the same values,
+   * maybe in a different order, case-sensitively.
+   */
+  assertDisabledHostsEqual(actual, expected) {
+    Assert.deepEqual(actual.sort(), expected.sort());
+  },
+
+  /**
+   * Checks whether the given time, expressed as the number of milliseconds
+   * since January 1, 1970, 00:00:00 UTC, falls within 30 seconds of now.
+   */
+  assertTimeIsAboutNow(timeMs) {
+    Assert.ok(Math.abs(timeMs - Date.now()) < 30000);
+  },
+};
+
+/**
+ * This object contains functions that return new instances of nsILoginInfo for
+ * every call.  The returned instances can be compared using their "equals" or
+ * "matches" methods, or modified for the needs of the specific test being run.
+ *
+ * Any modification to the test data requires updating the tests accordingly, in
+ * particular the search tests.
+ */
+this.LoginTestUtils.testData = {
+  /**
+   * Returns a new nsILoginInfo for use with form submits.
+   *
+   * @param modifications
+   *        Each property of this object replaces the property of the same name
+   *        in the returned nsILoginInfo or nsILoginMetaInfo.
+   */
+  formLogin(modifications) {
+    let loginInfo = new LoginInfo("http://www3.example.com",
+                                  "http://www.example.com", null,
+                                  "the username", "the password",
+                                  "form_field_username", "form_field_password");
+    loginInfo.QueryInterface(Ci.nsILoginMetaInfo);
+    if (modifications) {
+      for (let [name, value] of Iterator(modifications)) {
+        loginInfo[name] = value;
+      }
+    }
+    return loginInfo;
+  },
+
+  /**
+   * Returns a new nsILoginInfo for use with HTTP authentication.
+   *
+   * @param modifications
+   *        Each property of this object replaces the property of the same name
+   *        in the returned nsILoginInfo or nsILoginMetaInfo.
+   */
+  authLogin(modifications) {
+    let loginInfo = new LoginInfo("http://www.example.org", null,
+                                  "The HTTP Realm", "the username",
+                                  "the password", "", "");
+    loginInfo.QueryInterface(Ci.nsILoginMetaInfo);
+    if (modifications) {
+      for (let [name, value] of Iterator(modifications)) {
+        loginInfo[name] = value;
+      }
+    }
+    return loginInfo;
+  },
+
+  /**
+   * Returns an array of typical nsILoginInfo that could be stored in the
+   * database.
+   */
+  loginList() {
+    return [
+      // --- Examples of form logins (subdomains of example.com) ---
+
+      // Simple form login with named fields for username and password.
+      new LoginInfo("http://www.example.com", "http://www.example.com", null,
+                    "the username", "the password for www.example.com",
+                    "form_field_username", "form_field_password"),
+
+      // Different schemes are treated as completely different sites.
+      new LoginInfo("https://www.example.com", "https://www.example.com", null,
+                    "the username", "the password for https",
+                    "form_field_username", "form_field_password"),
+
+      // Subdomains are treated as completely different sites.
+      new LoginInfo("https://example.com", "https://example.com", null,
+                    "the username", "the password for example.com",
+                    "form_field_username", "form_field_password"),
+
+      // Forms found on the same host, but with different hostnames in the
+      // "action" attribute, are handled independently.
+      new LoginInfo("http://www3.example.com", "http://www.example.com", null,
+                    "the username", "the password",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://www3.example.com", "https://www.example.com", null,
+                    "the username", "the password",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://www3.example.com", "http://example.com", null,
+                    "the username", "the password",
+                    "form_field_username", "form_field_password"),
+
+      // It is not possible to store multiple passwords for the same username,
+      // however multiple passwords can be stored when the usernames differ.
+      // An empty username is a valid case and different from the others.
+      new LoginInfo("http://www4.example.com", "http://www4.example.com", null,
+                    "username one", "password one",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://www4.example.com", "http://www4.example.com", null,
+                    "username two", "password two",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://www4.example.com", "http://www4.example.com", null,
+                    "", "password three",
+                    "form_field_username", "form_field_password"),
+
+      // Username and passwords fields in forms may have no "name" attribute.
+      new LoginInfo("http://www5.example.com", "http://www5.example.com", null,
+                    "multi username", "multi password", "", ""),
+
+      // Forms with PIN-type authentication will typically have no username.
+      new LoginInfo("http://www6.example.com", "http://www6.example.com", null,
+                    "", "12345", "", "form_field_password"),
+
+      // --- Examples of authentication logins (subdomains of example.org) ---
+
+      // Simple HTTP authentication login.
+      new LoginInfo("http://www.example.org", null, "The HTTP Realm",
+                    "the username", "the password", "", ""),
+
+      // Simple FTP authentication login.
+      new LoginInfo("ftp://ftp.example.org", null, "ftp://ftp.example.org",
+                    "the username", "the password", "", ""),
+
+      // Multiple HTTP authentication logins can be stored for different realms.
+      new LoginInfo("http://www2.example.org", null, "The HTTP Realm",
+                    "the username", "the password", "", ""),
+      new LoginInfo("http://www2.example.org", null, "The HTTP Realm Other",
+                    "the username other", "the password other", "", ""),
+
+      // --- Both form and authentication logins (example.net) ---
+
+      new LoginInfo("http://example.net", "http://example.net", null,
+                    "the username", "the password",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://example.net", "http://www.example.net", null,
+                    "the username", "the password",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://example.net", "http://www.example.net", null,
+                    "username two", "the password",
+                    "form_field_username", "form_field_password"),
+      new LoginInfo("http://example.net", null, "The HTTP Realm",
+                    "the username", "the password", "", ""),
+      new LoginInfo("http://example.net", null, "The HTTP Realm Other",
+                    "username two", "the password", "", ""),
+      new LoginInfo("ftp://example.net", null, "ftp://example.net",
+                    "the username", "the password", "", ""),
+
+      // --- Examples of logins added by extensions (chrome scheme) ---
+
+      new LoginInfo("chrome://example_extension", null, "Example Login One",
+                    "the username", "the password one", "", ""),
+      new LoginInfo("chrome://example_extension", null, "Example Login Two",
+                    "the username", "the password two", "", ""),
+    ];
+  },
+};
diff --git a/toolkit/components/passwordmgr/test/unit/head.js b/toolkit/components/passwordmgr/test/unit/head.js
index 14ae04dbc6f3..59dfb6b48b4d 100644
--- a/toolkit/components/passwordmgr/test/unit/head.js
+++ b/toolkit/components/passwordmgr/test/unit/head.js
@@ -31,6 +31,13 @@ const LoginInfo =
       Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
                              "nsILoginInfo", "init");
 
+// Import LoginTestUtils.jsm as LoginTest.
+XPCOMUtils.defineLazyModuleGetter(this, "LoginTest",
+                                  "resource://testing-common/LoginTestUtils.jsm",
+                                  "LoginTestUtils");
+LoginTest.Assert = Assert;
+const TestData = LoginTest.testData;
+
 /**
  * All the tests are implemented with add_task, this starts them automatically.
  */
@@ -86,29 +93,6 @@ function getTempFile(aLeafName)
   return file;
 }
 
-/**
- * Allows waiting for an observer notification once.
- *
- * @param aTopic
- *        Notification topic to observe.
- *
- * @return {Promise}
- * @resolves The array [aSubject, aData] from the observed notification.
- * @rejects Never.
- */
-function promiseTopicObserved(aTopic)
-{
-  let deferred = Promise.defer();
-
-  Services.obs.addObserver(
-    function PTO_observe(aSubject, aTopic, aData) {
-      Services.obs.removeObserver(PTO_observe, aTopic);
-      deferred.resolve([aSubject, aData]);
-    }, aTopic, false);
-
-  return deferred.promise;
-}
-
 /**
  * Returns a new XPCOM property bag with the provided properties.
  *
@@ -134,70 +118,6 @@ function newPropertyBag(aProperties)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-//// Local helpers
-
-const LoginTest = {
-  /**
-   * Forces the storage module to save all data, and the Login Manager service
-   * to replace the storage module with a newly initialized instance.
-   */
-  reloadData: function ()
-  {
-    Services.obs.notifyObservers(null, "passwordmgr-storage-replace", null);
-    yield promiseTopicObserved("passwordmgr-storage-replace-complete");
-  },
-
-  /**
-   * Erases all the data stored by the Login Manager service.
-   */
-  clearData: function ()
-  {
-    Services.logins.removeAllLogins();
-    for (let hostname of Services.logins.getAllDisabledHosts()) {
-      Services.logins.setLoginSavingEnabled(hostname, true);
-    }
-  },
-
-  /**
-   * Checks that the currently stored list of nsILoginInfo matches the provided
-   * array.  The comparison uses the "equals" method of nsILoginInfo, that does
-   * not include nsILoginMetaInfo properties in the test.
-   */
-  checkLogins: function (aExpectedLogins)
-  {
-    this.assertLoginListsEqual(Services.logins.getAllLogins(), aExpectedLogins);
-  },
-
-  /**
-   * Checks that the two provided arrays of nsILoginInfo have the same length,
-   * and every login in aExpectedLogins is also found in aActualLogins.  The
-   * comparison uses the "equals" method of nsILoginInfo, that does not include
-   * nsILoginMetaInfo properties in the test.
-   */
-  assertLoginListsEqual: function (aActual, aExpected)
-  {
-    do_check_eq(aExpected.length, aActual.length);
-    do_check_true(aExpected.every(e => aActual.some(a => a.equals(e))));
-  },
-
-  /**
-   * Checks that the two provided arrays of strings contain the same values,
-   * maybe in a different order, case-sensitively.
-   */
-  assertDisabledHostsEqual: function (aActual, aExpected)
-  {
-    Assert.deepEqual(aActual.sort(), aExpected.sort());
-  },
-
-  /**
-   * Checks whether the given time, expressed as the number of milliseconds
-   * since January 1, 1970, 00:00:00 UTC, falls within 30 seconds of now.
-   */
-  assertTimeIsAboutNow: function (aTimeMs)
-  {
-    do_check_true(Math.abs(aTimeMs - Date.now()) < 30000);
-  }
-};
 
 const RecipeHelpers = {
   initNewParent() {
@@ -238,163 +158,6 @@ const RecipeHelpers = {
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//// Predefined test data
-
-/**
- * This object contains functions that return new instances of nsILoginInfo for
- * every call.  The returned instances can be compared using their "equals" or
- * "matches" methods, or modified for the needs of the specific test being run.
- *
- * Any modification to the test data requires updating the tests accordingly, in
- * particular the search tests.
- */
-const TestData = {
-  /**
-   * Returns a new nsILoginInfo for use with form submits.
-   *
-   * @param aModifications
-   *        Each property of this object replaces the property of the same name
-   *        in the returned nsILoginInfo or nsILoginMetaInfo.
-   */
-  formLogin: function (aModifications)
-  {
-    let loginInfo = new LoginInfo("http://www3.example.com",
-                                  "http://www.example.com", null,
-                                  "the username", "the password",
-                                  "form_field_username", "form_field_password");
-    loginInfo.QueryInterface(Ci.nsILoginMetaInfo);
-    if (aModifications) {
-      for (let [name, value] of Iterator(aModifications)) {
-        loginInfo[name] = value;
-      }
-    }
-    return loginInfo;
-  },
-
-  /**
-   * Returns a new nsILoginInfo for use with HTTP authentication.
-   *
-   * @param aModifications
-   *        Each property of this object replaces the property of the same name
-   *        in the returned nsILoginInfo or nsILoginMetaInfo.
-   */
-  authLogin: function (aModifications)
-  {
-    let loginInfo = new LoginInfo("http://www.example.org", null,
-                                  "The HTTP Realm", "the username",
-                                  "the password", "", "");
-    loginInfo.QueryInterface(Ci.nsILoginMetaInfo);
-    if (aModifications) {
-      for (let [name, value] of Iterator(aModifications)) {
-        loginInfo[name] = value;
-      }
-    }
-    return loginInfo;
-  },
-
-  /**
-   * Returns an array of typical nsILoginInfo that could be stored in the
-   * database.
-   */
-  loginList: function ()
-  {
-    return [
-      // --- Examples of form logins (subdomains of example.com) ---
-
-      // Simple form login with named fields for username and password.
-      new LoginInfo("http://www.example.com", "http://www.example.com", null,
-                    "the username", "the password for www.example.com",
-                    "form_field_username", "form_field_password"),
-
-      // Different schemes are treated as completely different sites.
-      new LoginInfo("https://www.example.com", "https://www.example.com", null,
-                    "the username", "the password for https",
-                    "form_field_username", "form_field_password"),
-
-      // Subdomains are treated as completely different sites.
-      new LoginInfo("https://example.com", "https://example.com", null,
-                    "the username", "the password for example.com",
-                    "form_field_username", "form_field_password"),
-
-      // Forms found on the same host, but with different hostnames in the
-      // "action" attribute, are handled independently.
-      new LoginInfo("http://www3.example.com", "http://www.example.com", null,
-                    "the username", "the password",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://www3.example.com", "https://www.example.com", null,
-                    "the username", "the password",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://www3.example.com", "http://example.com", null,
-                    "the username", "the password",
-                    "form_field_username", "form_field_password"),
-
-      // It is not possible to store multiple passwords for the same username,
-      // however multiple passwords can be stored when the usernames differ.
-      // An empty username is a valid case and different from the others.
-      new LoginInfo("http://www4.example.com", "http://www4.example.com", null,
-                    "username one", "password one",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://www4.example.com", "http://www4.example.com", null,
-                    "username two", "password two",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://www4.example.com", "http://www4.example.com", null,
-                    "", "password three",
-                    "form_field_username", "form_field_password"),
-
-      // Username and passwords fields in forms may have no "name" attribute.
-      new LoginInfo("http://www5.example.com", "http://www5.example.com", null,
-                    "multi username", "multi password", "", ""),
-
-      // Forms with PIN-type authentication will typically have no username.
-      new LoginInfo("http://www6.example.com", "http://www6.example.com", null,
-                    "", "12345", "", "form_field_password"),
-
-      // --- Examples of authentication logins (subdomains of example.org) ---
-
-      // Simple HTTP authentication login.
-      new LoginInfo("http://www.example.org", null, "The HTTP Realm",
-                    "the username", "the password", "", ""),
-
-      // Simple FTP authentication login.
-      new LoginInfo("ftp://ftp.example.org", null, "ftp://ftp.example.org",
-                    "the username", "the password", "", ""),
-
-      // Multiple HTTP authentication logins can be stored for different realms.
-      new LoginInfo("http://www2.example.org", null, "The HTTP Realm",
-                    "the username", "the password", "", ""),
-      new LoginInfo("http://www2.example.org", null, "The HTTP Realm Other",
-                    "the username other", "the password other", "", ""),
-
-      // --- Both form and authentication logins (example.net) ---
-
-      new LoginInfo("http://example.net", "http://example.net", null,
-                    "the username", "the password",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://example.net", "http://www.example.net", null,
-                    "the username", "the password",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://example.net", "http://www.example.net", null,
-                    "username two", "the password",
-                    "form_field_username", "form_field_password"),
-      new LoginInfo("http://example.net", null, "The HTTP Realm",
-                    "the username", "the password", "", ""),
-      new LoginInfo("http://example.net", null, "The HTTP Realm Other",
-                    "username two", "the password", "", ""),
-      new LoginInfo("ftp://example.net", null, "ftp://example.net",
-                    "the username", "the password", "", ""),
-
-      // --- Examples of logins added by extensions (chrome scheme) ---
-
-      new LoginInfo("chrome://example_extension", null, "Example Login One",
-                    "the username", "the password one", "", ""),
-      new LoginInfo("chrome://example_extension", null, "Example Login Two",
-                    "the username", "the password two", "", ""),
-    ];
-  },
-};
-
-////////////////////////////////////////////////////////////////////////////////
 //// Initialization functions common to all tests
 
 add_task(function test_common_initialize()

From ba4204163403464ef0d7df73ff292c6c60104dbc Mon Sep 17 00:00:00 2001
From: Shawn Huang <shuang@mozilla.com>
Date: Thu, 19 Mar 2015 02:22:00 -0400
Subject: [PATCH 60/80] Bug 1144089 - Map AVRCP attribute ID correctly.
 r=tzimmermann

---
 dom/bluetooth/BluetoothCommon.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dom/bluetooth/BluetoothCommon.h b/dom/bluetooth/BluetoothCommon.h
index abdbef81e525..bc334ae4ba9e 100644
--- a/dom/bluetooth/BluetoothCommon.h
+++ b/dom/bluetooth/BluetoothCommon.h
@@ -390,13 +390,13 @@ enum {
 };
 
 enum BluetoothAvrcpMediaAttribute {
-  AVRCP_MEDIA_ATTRIBUTE_TITLE,
-  AVRCP_MEDIA_ATTRIBUTE_ARTIST,
-  AVRCP_MEDIA_ATTRIBUTE_ALBUM,
-  AVRCP_MEDIA_ATTRIBUTE_TRACK_NUM,
-  AVRCP_MEDIA_ATTRIBUTE_NUM_TRACKS,
-  AVRCP_MEDIA_ATTRIBUTE_GENRE,
-  AVRCP_MEDIA_ATTRIBUTE_PLAYING_TIME
+  AVRCP_MEDIA_ATTRIBUTE_TITLE = 0x01,
+  AVRCP_MEDIA_ATTRIBUTE_ARTIST = 0x02,
+  AVRCP_MEDIA_ATTRIBUTE_ALBUM = 0x03,
+  AVRCP_MEDIA_ATTRIBUTE_TRACK_NUM = 0x04,
+  AVRCP_MEDIA_ATTRIBUTE_NUM_TRACKS = 0x05,
+  AVRCP_MEDIA_ATTRIBUTE_GENRE = 0x6,
+  AVRCP_MEDIA_ATTRIBUTE_PLAYING_TIME = 0x7
 };
 
 enum BluetoothAvrcpPlayerAttribute {

From 791a83eee8aa071485cf5fb7f34ed38b24d4381d Mon Sep 17 00:00:00 2001
From: Jonathan Hao <jhao@mozilla.com>
Date: Thu, 19 Mar 2015 16:45:43 +0800
Subject: [PATCH 61/80] Bug 1144513 - [gonk-lmr1] Adapt RTSPSource.cpp.
 r=ettseng

---
 netwerk/protocol/rtsp/rtsp/RTSPSource.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
index 3af194e90b69..5eaa5b3d6d84 100644
--- a/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
+++ b/netwerk/protocol/rtsp/rtsp/RTSPSource.cpp
@@ -525,7 +525,7 @@ void RTSPSource::onMessageReceived(const sp<AMessage> &msg) {
             sp<AnotherPacketSource> source = info->mSource;
             if (source != NULL) {
 #if ANDROID_VERSION >= 21
-                source->queueDiscontinuity(ATSParser::DISCONTINUITY_SEEK, NULL,
+                source->queueDiscontinuity(ATSParser::DISCONTINUITY_TIME, NULL,
                                            true /* discard */);
 #else
                 source->queueDiscontinuity(ATSParser::DISCONTINUITY_SEEK, NULL);

From 2019efb1ec9f27e382418d27f48494a675546fee Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 07:40:27 -0700
Subject: [PATCH 62/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/99b3d40368d1
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #25451 from stasm/1013831-detect-duplicate-strings

Bug 1013831 - Detect duplicated strings in .properties files. r=gandalf f=flod

========

https://hg.mozilla.org/integration/gaia-central/rev/93d9838ee28f
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1013831 - Detect duplicated strings in .properties files. r=gandalf f=flod
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index cacfa02b1fc5..76163f92830b 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "640001a772e4c9bd35a8b0017f842b86fbab95a8", 
+        "git_revision": "d6cf6dde876c897a68c18ed95cad3bd506467ce4", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "d33e7218307bcc28da09e24660f5a46dbb3e643a", 
+    "revision": "99b3d40368d12d274db9a641058daeeeedafbab1", 
     "repo_path": "integration/gaia-central"
 }

From 9e22302987f4388a296c4c6d7f4a6269f03d8865 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 07:43:33 -0700
Subject: [PATCH 63/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 02103a4d9541..4df4a55bc704 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 8b92342ea694..153acfc62865 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index db2b08f46d02..a8404574fbdb 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f2734ecd87fd..5decb5c68413 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index df40b59e1604..3c93f7d5badf 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 8b92342ea694..153acfc62865 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index dffeec185d7f..697b31354e30 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ab97f318160d..2d7904879adc 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 700f11c0b26d..3188de84fa57 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index fba88e721db2..df0ece136cb7 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="640001a772e4c9bd35a8b0017f842b86fbab95a8"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 89acfbfb86db9daae1f120a025adec9a1ca5d4a3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 07:57:04 -0700
Subject: [PATCH 64/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8069e8e1ecc8
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #28957 from arcturus/bug-1135927

Bug 1135927 - [RTL][Contacts] checkboxes overlap with alphabet picker r=...

========

https://hg.mozilla.org/integration/gaia-central/rev/35fa883c1780
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1135927 - [RTL][Contacts] checkboxes overlap with alphabet picker r=ferjm
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 76163f92830b..37e6293d6565 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "d6cf6dde876c897a68c18ed95cad3bd506467ce4", 
+        "git_revision": "5be266af6ba3608b877a4d3acbad4dc4165f9cc9", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "99b3d40368d12d274db9a641058daeeeedafbab1", 
+    "revision": "8069e8e1ecc8661116645c0d4e3b82d124a2649a", 
     "repo_path": "integration/gaia-central"
 }

From 9775a3f3f1afb25b12820ede584df3dff934d562 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 08:00:00 -0700
Subject: [PATCH 65/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 4df4a55bc704..4e3982da2b02 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 153acfc62865..6f161ec76977 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index a8404574fbdb..2f3e4b89bab5 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 5decb5c68413..af3edaee5b6b 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 3c93f7d5badf..2ad46a6ea120 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 153acfc62865..6f161ec76977 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 697b31354e30..5e54d8476a09 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2d7904879adc..d7318928b069 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 3188de84fa57..eb50426f4580 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index df0ece136cb7..cbf67b508a28 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d6cf6dde876c897a68c18ed95cad3bd506467ce4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 284676214af0df09fe4aba52e1aa405476ed7723 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 09:02:16 -0700
Subject: [PATCH 66/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/24bdaee91d5a
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #28982 from Cwiiis/bug1141470-move-icon-between-collapsed-groups

Bug 1141470 - Allow dropping icons between collapsed groups. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/819fea60b812
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1141470 - Allow dropping icons between collapsed groups. r=kgrandon
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 37e6293d6565..68a6ef917703 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "5be266af6ba3608b877a4d3acbad4dc4165f9cc9", 
+        "git_revision": "9d394b0802dab92a1d3505dc73f1f80c28ab4ca0", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "8069e8e1ecc8661116645c0d4e3b82d124a2649a", 
+    "revision": "24bdaee91d5a5efa2cc5480f7e449debe312012a", 
     "repo_path": "integration/gaia-central"
 }

From 0bd2a8b534f21897b667a59447a9cb43d0924ade Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 09:04:55 -0700
Subject: [PATCH 67/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 4e3982da2b02..17edb1188283 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 6f161ec76977..f31f3938b368 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2f3e4b89bab5..a015e52707d3 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index af3edaee5b6b..1f638fcdad44 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 2ad46a6ea120..6773f19b2664 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 6f161ec76977..f31f3938b368 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 5e54d8476a09..7d2441b37e44 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index d7318928b069..ce008a9ad3e1 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index eb50426f4580..72ac15f256e7 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index cbf67b508a28..999726f2f0d8 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="5be266af6ba3608b877a4d3acbad4dc4165f9cc9"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 742cf295fde38ab822d802287fb27e882aa1f822 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 20 Mar 2015 17:16:59 +0100
Subject: [PATCH 68/80] Backed out changeset b2e71f32548f (bug 1085557) for
 breaking nightly builds

---
 build/macosx/mozconfig.common | 2 --
 build/mozconfig.win-common    | 2 --
 build/unix/mozconfig.linux    | 2 --
 3 files changed, 6 deletions(-)

diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
index 1c352a673ede..37722f3062c2 100644
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -34,5 +34,3 @@ if [ -z "$CXX" ]; then
 fi
 
 . "$topsrcdir/build/mozconfig.cache"
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
diff --git a/build/mozconfig.win-common b/build/mozconfig.win-common
index 72e70f8f26a4..abcde1863188 100644
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -11,5 +11,3 @@ fi
 # Some builds (eg: Mulet) don't want the installer, so only set this if it
 # hasn't already been set.
 MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/c/builds/crash-stats-api.token
diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
index 5e7c0b3d4423..841af1e7bb46 100644
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -40,5 +40,3 @@ if [ -d "$topsrcdir/gtk3" ]; then
   mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/gtk3/usr/local/lib"
   ac_add_options --enable-default-toolkit=cairo-gtk3
 fi
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token

From 577132d315f2ab2ee05ac842acf42fd59a037812 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 09:20:18 -0700
Subject: [PATCH 69/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8fe2bb847cc3
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #29013 from eliperelman/bug-1141573

Bug 1141573 - Bumping gaia-raptor to v1.1.1 r=rwood a=npotb

========

https://hg.mozilla.org/integration/gaia-central/rev/a7717904adce
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1141573 - Bumping gaia-raptor to v1.1.1 r=rwood a=npotb
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 68a6ef917703..1afe82ac7296 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "9d394b0802dab92a1d3505dc73f1f80c28ab4ca0", 
+        "git_revision": "69c230da400089c4311ce82867e26f266e648c6f", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "24bdaee91d5a5efa2cc5480f7e449debe312012a", 
+    "revision": "8fe2bb847cc3542c215faac74246b18e99a62391", 
     "repo_path": "integration/gaia-central"
 }

From 904ad029a2e48871bb34da4ba6a662e3fbadfd94 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 09:22:52 -0700
Subject: [PATCH 70/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 17edb1188283..52adcdd73dd7 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f31f3938b368..f5a867a5feee 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index a015e52707d3..fa5bf593ffec 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 1f638fcdad44..dec87b7ad06b 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 6773f19b2664..a02059caf55c 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f31f3938b368..f5a867a5feee 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 7d2441b37e44..b3dead13b146 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index ce008a9ad3e1..78957e5a350b 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 72ac15f256e7..55758f716d21 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 999726f2f0d8..49928d1b8a5e 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9d394b0802dab92a1d3505dc73f1f80c28ab4ca0"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 6c66377df5208c31e097abb7aa47df19f03ebc0e Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 20 Mar 2015 10:26:01 -0700
Subject: [PATCH 71/80] Bug 1143937 - Make BrowserTestUtils.waitForEvent not
 use flaky timeouts and cover more use cases. r=smacleod

---
 .../general/browser_tab_detach_restore.js     |  4 +-
 .../BrowserTestUtils/BrowserTestUtils.jsm     | 79 ++++++++-----------
 testing/modules/TestUtils.jsm                 | 10 +--
 3 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/browser/base/content/test/general/browser_tab_detach_restore.js b/browser/base/content/test/general/browser_tab_detach_restore.js
index 0557c9e15667..804be0869d7b 100644
--- a/browser/base/content/test/general/browser_tab_detach_restore.js
+++ b/browser/base/content/test/general/browser_tab_detach_restore.js
@@ -21,8 +21,8 @@ add_task(function*() {
   is(SessionStore.getClosedWindowCount(), 1, "Should have restore data for the closed window");
 
   win = SessionStore.undoCloseWindow(0);
-  yield BrowserTestUtils.waitForEvent(win, "load", 10000);
-  yield BrowserTestUtils.waitForEvent(win.gBrowser.tabs[0], "SSTabRestored", 10000);
+  yield BrowserTestUtils.waitForEvent(win, "load");
+  yield BrowserTestUtils.waitForEvent(win.gBrowser.tabs[0], "SSTabRestored");
 
   is(win.gBrowser.tabs.length, 1, "Should have restored one tab");
   is(win.gBrowser.selectedBrowser.currentURI.spec, uri, "Should have restored the right page");
diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
index b9324eec47ec..4233a1b7e293 100644
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
@@ -27,15 +27,6 @@ Cc["@mozilla.org/globalmessagemanager;1"]
   .loadFrameScript(
     "chrome://mochikit/content/tests/BrowserTestUtils/content-utils.js", true);
 
-
-/**
- * Default wait period in millseconds, when waiting for the expected
- * event to occur.
- * @type {number}
- */
-const DEFAULT_WAIT = 2000;
-
-
 this.BrowserTestUtils = {
   /**
    * @param {xul:browser} browser
@@ -128,51 +119,51 @@ this.BrowserTestUtils = {
     });
   },
 
-
   /**
-   * Waits a specified number of miliseconds for a specified event to be
-   * fired on a specified element.
+   * Waits for an event to be fired on a specified element.
    *
    * Usage:
-   *    let receivedEvent = BrowserTestUtil.waitForEvent(element, "eventName");
+   *    let promiseEvent = BrowserTestUtil.waitForEvent(element, "eventName");
    *    // Do some processing here that will cause the event to be fired
    *    // ...
    *    // Now yield until the Promise is fulfilled
-   *    yield receivedEvent;
-   *    if (receivedEvent && !(receivedEvent instanceof Error)) {
-   *      receivedEvent.msg == "eventName";
-   *      // ...
-   *    }
+   *    let receivedEvent = yield promiseEvent;
    *
-   * @param {Element} subject - The element that should receive the event.
-   * @param {string} eventName - The event to wait for.
-   * @param {number} timeoutMs - The number of miliseconds to wait before giving up.
-   * @param {Element} target - Expected target of the event.
-   * @returns {Promise} A Promise that resolves to the received event, or
-   *                    rejects with an Error.
+   * @param {Element} subject
+   *        The element that should receive the event.
+   * @param {string} eventName
+   *        Name of the event to listen to.
+   * @param {function} checkFn [optional]
+   *        Called with the Event object as argument, should return true if the
+   *        event is the expected one, or false if it should be ignored and
+   *        listening should continue. If not specified, the first event with
+   *        the specified name resolves the returned promise.
+   *
+   * @note Because this function is intended for testing, any error in checkFn
+   *       will cause the returned promise to be rejected instead of waiting for
+   *       the next event, since this is probably a bug in the test.
+   *
+   * @returns {Promise}
+   * @resolves The Event object.
    */
-  waitForEvent(subject, eventName, timeoutMs, target) {
+  waitForEvent(subject, eventName, checkFn) {
     return new Promise((resolve, reject) => {
-      function listener(event) {
-        if (target && target !== event.target) {
-          return;
+      subject.addEventListener(eventName, function listener(event) {
+        try {
+          if (checkFn && !checkFn(event)) {
+            return;
+          }
+          subject.removeEventListener(eventName, listener);
+          resolve(event);
+        } catch (ex) {
+          try {
+            subject.removeEventListener(eventName, listener);
+          } catch (ex2) {
+            // Maybe the provided object does not support removeEventListener.
+          }
+          reject(ex);
         }
-
-        subject.removeEventListener(eventName, listener);
-        clearTimeout(timerID);
-        resolve(event);
-      }
-
-      timeoutMs = timeoutMs || DEFAULT_WAIT;
-      let stack = new Error().stack;
-
-      let timerID = setTimeout(() => {
-        subject.removeEventListener(eventName, listener);
-        reject(new Error(`${eventName} event timeout at ${stack}`));
-      }, timeoutMs);
-
-
-      subject.addEventListener(eventName, listener);
+      });
     });
   },
 };
diff --git a/testing/modules/TestUtils.jsm b/testing/modules/TestUtils.jsm
index 57e621075029..901a73557e23 100644
--- a/testing/modules/TestUtils.jsm
+++ b/testing/modules/TestUtils.jsm
@@ -49,15 +49,13 @@ this.TestUtils = {
     return new Promise((resolve, reject) => {
       Services.obs.addObserver(function observer(subject, topic, data) {
         try {
-          try {
-            if (checkFn && !checkFn(subject, data)) {
-              return;
-            }
-          } finally {
-            Services.obs.removeObserver(observer, topic);
+          if (checkFn && !checkFn(subject, data)) {
+            return;
           }
+          Services.obs.removeObserver(observer, topic);
           resolve([subject, data]);
         } catch (ex) {
+          Services.obs.removeObserver(observer, topic);
           reject(ex);
         }
       }, topic, false);

From dbdf7dfec009aaf4871e56482421741385f163b7 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 20 Mar 2015 10:26:01 -0700
Subject: [PATCH 72/80] Bug 1144869 - Add BrowserTestUtils.withNewTab.
 r=smacleod

---
 .../BrowserTestUtils/BrowserTestUtils.jsm     | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
index 4233a1b7e293..a27bd21bb016 100644
--- a/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
+++ b/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
@@ -19,6 +19,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
 Cu.import("resource://testing-common/TestUtils.jsm");
 
@@ -29,13 +30,52 @@ Cc["@mozilla.org/globalmessagemanager;1"]
 
 this.BrowserTestUtils = {
   /**
+   * Loads a page in a new tab, executes a Task and closes the tab.
+   *
+   * @param options
+   *        An object with the following properties:
+   *        {
+   *          gBrowser:
+   *            Reference to the "tabbrowser" element where the new tab should
+   *            be opened.
+   *          url:
+   *            String with the URL of the page to load.
+   *        }
+   * @param taskFn
+   *        Generator function representing a Task that will be executed while
+   *        the tab is loaded. The first argument passed to the function is a
+   *        reference to the browser object for the new tab.
+   *
+   * @return {Promise}
+   * @resolves When the tab has been closed.
+   * @rejects Any exception from taskFn is propagated.
+   */
+  withNewTab: Task.async(function* (options, taskFn) {
+    let tab = options.gBrowser.addTab(options.url);
+    yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+    options.gBrowser.selectedTab = tab;
+
+    yield taskFn(tab.linkedBrowser);
+
+    options.gBrowser.removeTab(tab);
+  }),
+
+  /**
+   * Waits for an ongoing page load in a browser window to complete.
+   *
+   * This can be used in conjunction with any synchronous method for starting a
+   * load, like the "addTab" method on "tabbrowser", and must be called before
+   * yielding control to the event loop. This is guaranteed to work because the
+   * way we're listening for the load is in the content-utils.js frame script,
+   * and then sending an async message up, so we can't miss the message.
+   *
    * @param {xul:browser} browser
    *        A xul:browser.
    * @param {Boolean} includeSubFrames
    *        A boolean indicating if loads from subframes should be included.
+   *
    * @return {Promise}
-   *         A Promise which resolves when a load event is triggered
-   *         for browser.
+   * @resolves When a load event is triggered for the browser.
    */
   browserLoaded(browser, includeSubFrames=false) {
     return new Promise(resolve => {

From 08befa063ab85774552a8c48fca2d4abb82dbe52 Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 20 Mar 2015 10:26:01 -0700
Subject: [PATCH 73/80] Bug 1143903 - Display username and password as separate
 fields in the password doorhanger. r=MattN

---
 browser/base/content/popup-notifications.inc  |   8 ++
 .../passwordmgr/nsLoginManagerPrompter.js     |  67 ++++++++----
 .../test/browser/browser_notifications.js     | 100 +++++++++++++-----
 .../passwordmgr/test/notification_common.js   |   2 +-
 .../passwordmgr/test/test_notifications.html  |   4 +-
 .../chrome/passwordmgr/passwordmgr.properties |   3 +
 6 files changed, 134 insertions(+), 50 deletions(-)

diff --git a/browser/base/content/popup-notifications.inc b/browser/base/content/popup-notifications.inc
index e4bdea72a36f..4082f4a36c0a 100644
--- a/browser/base/content/popup-notifications.inc
+++ b/browser/base/content/popup-notifications.inc
@@ -60,6 +60,14 @@
       </popupnotificationcontent>
     </popupnotification>
 
+    <popupnotification id="password-notification" hidden="true">
+      <popupnotificationcontent orient="vertical">
+        <textbox id="password-notification-username" disabled="true"/>
+        <textbox id="password-notification-password" type="password"
+                 disabled="true"/>
+      </popupnotificationcontent>
+    </popupnotification>
+
 #ifdef E10S_TESTING_ONLY
     <popupnotification id="enable-e10s-notification" hidden="true">
       <popupnotificationcontent orient="vertical"/>
diff --git a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
index c36e9d433256..983b18159f0d 100644
--- a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
+++ b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
@@ -806,19 +806,13 @@ LoginManagerPrompter.prototype = {
           this._getLocalizedString("notifyBarRememberPasswordButtonText");
     var rememberButtonAccessKey =
           this._getLocalizedString("notifyBarRememberPasswordButtonAccessKey");
+    var usernamePlaceholder =
+          this._getLocalizedString("noUsernamePlaceholder");
 
     var displayHost = this._getShortDisplayHost(aLogin.hostname);
-    var notificationText;
-    if (aLogin.username) {
-      var displayUser = this._sanitizeUsername(aLogin.username);
-      notificationText  = this._getLocalizedString(
-                                  "rememberPasswordMsg",
-                                  [displayUser, displayHost]);
-    } else {
-      notificationText  = this._getLocalizedString(
+    var notificationText = this._getLocalizedString(
                                   "rememberPasswordMsgNoUsername",
                                   [displayHost]);
-    }
 
     // The callbacks in |buttons| have a closure to access the variables
     // in scope here; set one to |this._pwmgr| so we can get back to pwmgr
@@ -854,12 +848,28 @@ LoginManagerPrompter.prototype = {
 
       var { browser } = this._getNotifyWindow();
 
+      let eventCallback = function (topic) {
+        if (topic != "showing") {
+          return false;
+        }
+
+        let chromeDoc = this.browser.ownerDocument;
+
+        chromeDoc.getElementById("password-notification-username")
+                 .setAttribute("placeholder", usernamePlaceholder);
+        chromeDoc.getElementById("password-notification-username")
+                 .setAttribute("value", aLogin.username);
+        chromeDoc.getElementById("password-notification-password")
+                 .setAttribute("value", aLogin.password);
+      };
+
       aNotifyObj.show(browser, "password", notificationText,
                       "password-notification-icon", mainAction,
                       secondaryActions,
                       { timeout: Date.now() + 10000,
                         persistWhileVisible: true,
-                        passwordNotificationType: "password-save" });
+                        passwordNotificationType: "password-save",
+                        eventCallback });
     } else {
       var notNowButtonText =
             this._getLocalizedString("notifyBarNotNowButtonText");
@@ -1016,21 +1026,18 @@ LoginManagerPrompter.prototype = {
    *        A notification box or a popup notification.
    */
   _showChangeLoginNotification : function (aNotifyObj, aOldLogin, aNewPassword) {
-    var notificationText;
-    if (aOldLogin.username) {
-      var displayUser = this._sanitizeUsername(aOldLogin.username);
-      notificationText  = this._getLocalizedString(
-                                    "updatePasswordMsg",
-                                    [displayUser]);
-    } else {
-      notificationText  = this._getLocalizedString(
-                                    "updatePasswordMsgNoUser");
-    }
-
     var changeButtonText =
           this._getLocalizedString("notifyBarUpdateButtonText");
     var changeButtonAccessKey =
           this._getLocalizedString("notifyBarUpdateButtonAccessKey");
+    var usernamePlaceholder =
+          this._getLocalizedString("noUsernamePlaceholder");
+
+    // We reuse the existing message, even if it expects a username, until we
+    // switch to the final terminology in bug 1144856.
+    var displayHost = this._getShortDisplayHost(aOldLogin.hostname);
+    var notificationText = this._getLocalizedString("updatePasswordMsg",
+                                                    [displayHost]);
 
     // The callbacks in |buttons| have a closure to access the variables
     // in scope here; set one to |this._pwmgr| so we can get back to pwmgr
@@ -1053,12 +1060,28 @@ LoginManagerPrompter.prototype = {
 
       var { browser } = this._getNotifyWindow();
 
+      let eventCallback = function (topic) {
+        if (topic != "showing") {
+          return false;
+        }
+
+        let chromeDoc = this.browser.ownerDocument;
+
+        chromeDoc.getElementById("password-notification-username")
+                 .setAttribute("placeholder", usernamePlaceholder);
+        chromeDoc.getElementById("password-notification-username")
+                 .setAttribute("value", aOldLogin.username);
+        chromeDoc.getElementById("password-notification-password")
+                 .setAttribute("value", aNewPassword);
+      };
+
       Services.telemetry.getHistogramById("PWMGR_PROMPT_UPDATE_ACTION").add(PROMPT_DISPLAYED);
       aNotifyObj.show(browser, "password", notificationText,
                       "password-notification-icon", mainAction,
                       null, { timeout: Date.now() + 10000,
                               persistWhileVisible: true,
-                              passwordNotificationType: "password-change" });
+                              passwordNotificationType: "password-change",
+                              eventCallback });
     } else {
       var dontChangeButtonText =
             this._getLocalizedString("notifyBarDontChangeButtonText");
diff --git a/toolkit/components/passwordmgr/test/browser/browser_notifications.js b/toolkit/components/passwordmgr/test/browser/browser_notifications.js
index 29e503f4c5cc..16efd9251a5e 100644
--- a/toolkit/components/passwordmgr/test/browser/browser_notifications.js
+++ b/toolkit/components/passwordmgr/test/browser/browser_notifications.js
@@ -1,33 +1,83 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-add_task(function* test_save() {
-  let tab = gBrowser.addTab("https://example.com/browser/toolkit/components/" +
-                            "passwordmgr/test/browser/form_basic.html");
-  let browser = tab.linkedBrowser;
-  yield BrowserTestUtils.browserLoaded(browser);
-  gBrowser.selectedTab = tab;
+Cu.import("resource://testing-common/LoginTestUtils.jsm", this);
 
-  let promiseShown = BrowserTestUtils.waitForEvent(PopupNotifications.panel,
-                                                   "Shown");
-  yield ContentTask.spawn(browser, null, function* () {
-    content.document.getElementById("form-basic-username").value = "username";
-    content.document.getElementById("form-basic-password").value = "password";
-    content.document.getElementById("form-basic").submit();
-  });
-  yield promiseShown;
-  let notificationElement = PopupNotifications.panel.childNodes[0];
+/**
+ * Test that the doorhanger notification for password saving is populated with
+ * the correct values in various password capture cases.
+ */
+add_task(function* test_save_change() {
+  let testCases = [{
+    username: "username",
+    password: "password",
+  }, {
+    username: "",
+    password: "password",
+  }, {
+    username: "username",
+    oldPassword: "password",
+    password: "newPassword",
+  }, {
+    username: "",
+    oldPassword: "password",
+    password: "newPassword",
+  }];
 
-  let promiseLogin = TestUtils.topicObserved("passwordmgr-storage-changed",
-                                             (_, data) => data == "addLogin");
-  notificationElement.button.doCommand();
-  let [login] = yield promiseLogin;
-  login.QueryInterface(Ci.nsILoginInfo);
+  for (let { username, oldPassword, password } of testCases) {
+    // Add a login for the origin of the form if testing a change notification.
+    if (oldPassword) {
+      Services.logins.addLogin(LoginTestUtils.testData.formLogin({
+        hostname: "https://example.com",
+        formSubmitURL: "https://example.com",
+        username,
+        password: oldPassword,
+      }));
+    }
 
-  Assert.equal(login.username, "username");
-  Assert.equal(login.password, "password");
+    yield BrowserTestUtils.withNewTab({
+      gBrowser,
+      url: "https://example.com/browser/toolkit/components/" +
+           "passwordmgr/test/browser/form_basic.html",
+    }, function* (browser) {
+      // Submit the form in the content page with the credentials from the test
+      // case. This will cause the doorhanger notification to be displayed.
+      let promiseShown = BrowserTestUtils.waitForEvent(PopupNotifications.panel,
+                                                       "Shown");
+      yield ContentTask.spawn(browser, { username, password },
+        function* ({ username, password }) {
+          let doc = content.document;
+          doc.getElementById("form-basic-username").value = username;
+          doc.getElementById("form-basic-password").value = password;
+          doc.getElementById("form-basic").submit();
+        });
+      yield promiseShown;
 
-  // Cleanup.
-  Services.logins.removeAllLogins();
-  gBrowser.removeTab(tab);
+      // Check the actual content of the popup notification.
+      Assert.equal(document.getElementById("password-notification-username")
+                           .getAttribute("value"), username);
+      Assert.equal(document.getElementById("password-notification-password")
+                           .getAttribute("value"), password);
+
+      // Simulate the action on the notification to request the login to be
+      // saved, and wait for the data to be updated or saved based on the type
+      // of operation we expect.
+      let expectedNotification = oldPassword ? "modifyLogin" : "addLogin";
+      let promiseLogin = TestUtils.topicObserved("passwordmgr-storage-changed",
+                         (_, data) => data == expectedNotification);
+      let notificationElement = PopupNotifications.panel.childNodes[0];
+      notificationElement.button.doCommand();
+      let [result] = yield promiseLogin;
+
+      // Check that the values in the database match the expected values.
+      let login = oldPassword ? result.QueryInterface(Ci.nsIArray)
+                                      .queryElementAt(1, Ci.nsILoginInfo)
+                              : result.QueryInterface(Ci.nsILoginInfo);
+      Assert.equal(login.username, username);
+      Assert.equal(login.password, password);
+    });
+
+    // Clean up the database before the next test case is executed.
+    Services.logins.removeAllLogins();
+  }
 });
diff --git a/toolkit/components/passwordmgr/test/notification_common.js b/toolkit/components/passwordmgr/test/notification_common.js
index 8b774aae9b63..ca3511cc777e 100644
--- a/toolkit/components/passwordmgr/test/notification_common.js
+++ b/toolkit/components/passwordmgr/test/notification_common.js
@@ -64,7 +64,7 @@ function clickPopupButton(aPopup, aButtonIndex) {
         ok(true, "Triggering main action");
         notification.button.doCommand();
     } else if (aButtonIndex <= aPopup.secondaryActions.length) {
-        var index = aButtonIndex - 1;
+        var index = aButtonIndex;
         ok(true, "Triggering secondary action " + index);
         notification.childNodes[index].doCommand();
     }
diff --git a/toolkit/components/passwordmgr/test/test_notifications.html b/toolkit/components/passwordmgr/test/test_notifications.html
index 65e634a321de..492e8d865d59 100644
--- a/toolkit/components/passwordmgr/test/test_notifications.html
+++ b/toolkit/components/passwordmgr/test/test_notifications.html
@@ -347,7 +347,7 @@ function checkTest() {
         ok(popup, "got notification popup");
         // Check the text, which comes from the localized saveLoginText string.
         notificationText = popup.message;
-        expectedText = /^Would you like to remember the password for \"notifyu1\" on example.org\?$/;
+        expectedText = /^Would you like to remember the password on example.org\?$/;
         ok(expectedText.test(notificationText), "Checking text: " + notificationText);
         popup.remove();
         break;
@@ -360,7 +360,7 @@ function checkTest() {
         ok(popup, "got notification popup");
         // Check the text, which comes from the localized saveLoginText string.
         notificationText = popup.message;
-        expectedText = /^Would you like to remember the password for \"nowisthetimeforallgoodmentocom[^e]\" on example.org\?$/;
+        expectedText = /^Would you like to remember the password on example.org\?$/;
         ok(expectedText.test(notificationText), "Checking text: " + notificationText);
         popup.remove();
         break;
diff --git a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
index db1bdc0c3b3d..230a26451ca9 100644
--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordmgr.properties
@@ -12,6 +12,9 @@ rememberPasswordMsg = Would you like to remember the password for "%1$S" on %2$S
 # LOCALIZATION NOTE (rememberPasswordMsgNoUsername):
 # String is the login's hostname.
 rememberPasswordMsgNoUsername = Would you like to remember the password on %S?
+# LOCALIZATION NOTE (noUsernamePlaceholder):
+# This is displayed in place of the username when it is missing.
+noUsernamePlaceholder=No username
 notNowButtonText = &Not Now
 notifyBarNotNowButtonText = Not Now
 notifyBarNotNowButtonAccessKey = N

From b772641e14a2d588ec841c681ab7693d1a4aa935 Mon Sep 17 00:00:00 2001
From: Dan Mosedale <dmose@meer.net>
Date: Fri, 20 Mar 2015 10:44:40 -0700
Subject: [PATCH 74/80] Bug 1123660 - add logging to Loop media connection
 telemetry, r=Standard8

---
 browser/app/profile/firefox.js                |   1 +
 .../loop/content/shared/js/otSdkDriver.js     | 127 ++++++++++++++----
 .../test/functional/test_1_browser_call.py    |   8 +-
 .../loop/test/shared/otSdkDriver_test.js      |  60 ++++++---
 4 files changed, 152 insertions(+), 44 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 24fdc05d44a3..d4feb700958c 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1698,6 +1698,7 @@ pref("loop.debug.loglevel", "Error");
 pref("loop.debug.dispatcher", false);
 pref("loop.debug.websocket", false);
 pref("loop.debug.sdk", false);
+pref("loop.debug.twoWayMediaTelemetry", false);
 #ifdef DEBUG
 pref("loop.CSP", "default-src 'self' about: file: chrome: http://localhost:*; img-src 'self' data: https://www.gravatar.com/ about: file: chrome:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net http://localhost:* ws://localhost:*; media-src blob:");
 #else
diff --git a/browser/components/loop/content/shared/js/otSdkDriver.js b/browser/components/loop/content/shared/js/otSdkDriver.js
index 9f2531a1536f..fe5aa06d8b1a 100644
--- a/browser/components/loop/content/shared/js/otSdkDriver.js
+++ b/browser/components/loop/content/shared/js/otSdkDriver.js
@@ -27,25 +27,37 @@ loop.OTSdkDriver = (function() {
       this.dispatcher = options.dispatcher;
       this.sdk = options.sdk;
 
-      // Note that this will only be defined and usable in a desktop-local
-      // context, not in the standalone web client.
-      this.mozLoop = options.mozLoop;
+      this._isDesktop = !!options.isDesktop;
+
+      if (this._isDesktop) {
+        if (!options.mozLoop) {
+          throw new Error("Missing option mozLoop");
+        }
+        this.mozLoop = options.mozLoop;
+      }
 
       this.connections = {};
-      this.connectionStartTime = this.CONNECTION_START_TIME_UNINITIALIZED;
+      this._setTwoWayMediaStartTime(this.CONNECTION_START_TIME_UNINITIALIZED);
 
       this.dispatcher.register(this, [
         "setupStreamElements",
         "setMute"
       ]);
 
+      // Set loop.debug.twoWayMediaTelemetry to true in the browser
+      // by changing the hidden pref loop.debug.twoWayMediaTelemetry using
+      // about:config, or use
+      //
+      // localStorage.setItem("debug.twoWayMediaTelemetry", true);
+      this._debugTwoWayMediaTelemetry =
+        loop.shared.utils.getBoolPreference("debug.twoWayMediaTelemetry");
+
     /**
      * XXX This is a workaround for desktop machines that do not have a
      * camera installed. As we don't yet have device enumeration, when
      * we do, this can be removed (bug 1138851), and the sdk should handle it.
      */
-    if ("isDesktop" in options && options.isDesktop &&
-        !window.MediaStreamTrack.getSources) {
+    if (this._isDesktop && !window.MediaStreamTrack.getSources) {
       // If there's no getSources function, the sdk defines its own and caches
       // the result. So here we define the "normal" one which doesn't get cached, so
       // we can change it later.
@@ -56,9 +68,6 @@ loop.OTSdkDriver = (function() {
   };
 
   OTSdkDriver.prototype = {
-    CONNECTION_START_TIME_UNINITIALIZED: -1,
-    CONNECTION_START_TIME_ALREADY_NOTED: -2,
-
     /**
      * Clones the publisher config into a new object, as the sdk modifies the
      * properties object.
@@ -236,7 +245,7 @@ loop.OTSdkDriver = (function() {
         delete this.publisher;
       }
 
-      this._noteConnectionLengthIfNeeded(this.connectionStartTime, performance.now());
+      this._noteConnectionLengthIfNeeded(this._getTwoWayMediaStartTime(), performance.now());
 
       // Also, tidy these variables ready for next time.
       delete this._sessionConnected;
@@ -244,7 +253,7 @@ loop.OTSdkDriver = (function() {
       delete this._publishedLocalStream;
       delete this._subscribedRemoteStream;
       this.connections = {};
-      this.connectionStartTime = this.CONNECTION_START_TIME_UNINITIALIZED;
+      this._setTwoWayMediaStartTime(this.CONNECTION_START_TIME_UNINITIALIZED);
     },
 
     /**
@@ -308,7 +317,7 @@ loop.OTSdkDriver = (function() {
       if (connection && (connection.id in this.connections)) {
         delete this.connections[connection.id];
       }
-      this._noteConnectionLengthIfNeeded(this.connectionStartTime, performance.now());
+      this._noteConnectionLengthIfNeeded(this._getTwoWayMediaStartTime(), performance.now());
       this.dispatcher.dispatch(new sharedActions.RemotePeerDisconnected({
         peerHungup: event.reason === "clientDisconnected"
       }));
@@ -335,7 +344,7 @@ loop.OTSdkDriver = (function() {
           return;
       }
 
-      this._noteConnectionLengthIfNeeded(this.connectionStartTime,
+      this._noteConnectionLengthIfNeeded(this._getTwoWayMediaStartTime(),
         performance.now());
       this.dispatcher.dispatch(new sharedActions.ConnectionFailure({
         reason: reason
@@ -408,7 +417,7 @@ loop.OTSdkDriver = (function() {
 
       this._subscribedRemoteStream = true;
       if (this._checkAllStreamsConnected()) {
-        this.connectionStartTime = performance.now();
+        this._setTwoWayMediaStartTime(performance.now());
         this.dispatcher.dispatch(new sharedActions.MediaConnected());
       }
     },
@@ -429,6 +438,56 @@ loop.OTSdkDriver = (function() {
       }
     },
 
+    /**
+     * Implementation detail, may be set to one of the CONNECTION_START_TIME
+     * constants, or a positive integer in milliseconds.
+     *
+     * @private
+     */
+    __twoWayMediaStartTime: undefined,
+
+    /**
+     * Used as a guard to make sure we don't inadvertently use an
+     * uninitialized value.
+     */
+    CONNECTION_START_TIME_UNINITIALIZED: -1,
+
+    /**
+     * Use as a guard to ensure that we don't note any bidirectional sessions
+     * twice.
+     */
+    CONNECTION_START_TIME_ALREADY_NOTED: -2,
+
+    /**
+     * Set and get the start time of the two-way media connection.  These
+     * are done as wrapper functions so that we can log sets to make manual
+     * verification of various telemetry scenarios possible.  The get API is
+     * analogous in order to follow the principle of least surprise for
+     * people consuming this code.
+     *
+     * If this._isDesktop is not true, returns immediately without making
+     * any changes, since this data is not used, and it makes reading
+     * the logs confusing for manual verification of both ends of the call in
+     * the same browser, which is a case we care about.
+     *
+     * @param start  start time in milliseconds, as returned by
+     *               performance.now()
+     * @private
+     */
+    _setTwoWayMediaStartTime: function(start) {
+      if (!this._isDesktop) {
+        return;
+      }
+
+      this.__twoWayMediaStartTime = start;
+      if (this._debugTwoWayMediaTelemetry) {
+        console.log("Loop Telemetry: noted two-way connection start, " +
+                    "start time in ms:", start);
+      }
+    },
+    _getTwoWayMediaStartTime: function() {
+      return this.__twoWayMediaStartTime;
+    },
 
     /**
      * Handles the event when the remote stream is destroyed.
@@ -528,7 +587,7 @@ loop.OTSdkDriver = (function() {
         // Now record the fact, and check if we've got all media yet.
         this._publishedLocalStream = true;
         if (this._checkAllStreamsConnected()) {
-          this.connectionStartTime = performance.now();
+          this._setTwoWayMediaStartTime(performance.now);
           this.dispatcher.dispatch(new sharedActions.MediaConnected());
         }
       }
@@ -562,6 +621,14 @@ loop.OTSdkDriver = (function() {
       }));
     },
 
+    /*
+     * XXX all of the bi-directional media connection telemetry stuff in this
+     * file, (much, but not all, of it is below) should be hoisted into its
+     * own object for maintainability and clarity, also in part because this
+     * stuff only wants to run one side of the connection, not both (tracked
+     * by bug 1145237).
+     */
+
     /**
      * A hook exposed only for the use of the functional tests so that
      * they can check that the bi-directional media count is being updated
@@ -574,7 +641,7 @@ loop.OTSdkDriver = (function() {
 
     /**
      * Wrapper for adding a keyed value that also updates
-     * connectionLengthNoted calls and sets this.connectionStartTime to
+     * connectionLengthNoted calls and sets the twoWayMediaStartTime to
      * this.CONNECTION_START_TIME_ALREADY_NOTED.
      *
      * @param {number} callLengthSeconds  the call length in seconds
@@ -594,15 +661,19 @@ loop.OTSdkDriver = (function() {
 
       this.mozLoop.telemetryAddKeyedValue("LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
         bucket);
-      this.connectionStartTime = this.CONNECTION_START_TIME_ALREADY_NOTED;
+      this._setTwoWayMediaStartTime(this.CONNECTION_START_TIME_ALREADY_NOTED);
 
       this._connectionLengthNotedCalls++;
+      if (this._debugTwoWayMediaTelemetry) {
+        console.log('Loop Telemetry: noted two-way media connection ' +
+          'in bucket: ', bucket);
+      }
     },
 
     /**
      * Note connection length if it's valid (the startTime has been initialized
      * and is not later than endTime) and not yet already noted.  If
-     * this.mozLoop is not defined, we're assumed to be running in the
+     * this._isDesktop is not true, we're assumed to be running in the
      * standalone client and return immediately.
      *
      * @param {number} startTime  in milliseconds
@@ -610,23 +681,31 @@ loop.OTSdkDriver = (function() {
      * @private
      */
     _noteConnectionLengthIfNeeded: function(startTime, endTime) {
-      if (!this.mozLoop) {
+      if (!this._isDesktop) {
         return;
       }
 
       if (startTime == this.CONNECTION_START_TIME_ALREADY_NOTED ||
           startTime == this.CONNECTION_START_TIME_UNINITIALIZED ||
           startTime > endTime) {
-        console.log("_noteConnectionLengthIfNeeded called with " +
-                    " invalid params, either the calls were never" +
-                    " connected or there is a bug; startTime:", startTime,
-                    "endTime:", endTime);
+        if (this._debugTwoWayMediaTelemetry) {
+          console.log("_noteConnectionLengthIfNeeded called with " +
+            " invalid params, either the calls were never" +
+            " connected or there is a bug; startTime:", startTime,
+            "endTime:", endTime);
+        }
         return;
       }
 
       var callLengthSeconds = (endTime - startTime) / 1000;
       this._noteConnectionLength(callLengthSeconds);
-    }
+    },
+
+    /**
+     * If set to true, make it easy to test/verify 2-way media connection
+     * telemetry code operation by viewing the logs.
+     */
+    _debugTwoWayMediaTelemetry: false
   };
 
   return OTSdkDriver;
diff --git a/browser/components/loop/test/functional/test_1_browser_call.py b/browser/components/loop/test/functional/test_1_browser_call.py
index 5e47d03c7f06..3ac53940cd84 100644
--- a/browser/components/loop/test/functional/test_1_browser_call.py
+++ b/browser/components/loop/test/functional/test_1_browser_call.py
@@ -193,7 +193,7 @@ class Test1BrowserCall(MarionetteTestCase):
 
     def local_get_media_start_time(self):
         return self.local_get_chatbox_window_expr(
-            "loop.conversation._sdkDriver.connectionStartTime")
+            "loop.conversation._sdkDriver._getTwoWayMediaStartTime()")
 
     # XXX could be memoized
     def local_get_media_start_time_uninitialized(self):
@@ -221,7 +221,7 @@ class Test1BrowserCall(MarionetteTestCase):
 
         self.assertGreater(noted_calls, 0,
                            "OTSdkDriver._connectionLengthNotedCalls should be "
-                           "> 0")
+                           "> 0, noted_calls = " + str(noted_calls))
 
     def test_1_browser_call(self):
         self.switch_to_panel()
@@ -252,8 +252,8 @@ class Test1BrowserCall(MarionetteTestCase):
         # self.local_enable_screenshare()
         # self.standalone_check_remote_screenshare()
 
-        # We hangup on the remote side, because this also leaves the
-        # local chatbox with the local publishing media still connected,
+        # We hangup on the remote (standalone) side, because this also leaves
+        # the local chatbox with the local publishing media still connected,
         # which means that the local_check_connection_length below
         # verifies that the connection is noted at the time the remote media
         # drops, rather than waiting until the window closes.
diff --git a/browser/components/loop/test/shared/otSdkDriver_test.js b/browser/components/loop/test/shared/otSdkDriver_test.js
index 384e5872fdba..11fc6cfc937e 100644
--- a/browser/components/loop/test/shared/otSdkDriver_test.js
+++ b/browser/components/loop/test/shared/otSdkDriver_test.js
@@ -77,7 +77,8 @@ describe("loop.OTSdkDriver", function () {
     driver = new loop.OTSdkDriver({
       dispatcher: dispatcher,
       sdk: sdk,
-      mozLoop: mozLoop
+      mozLoop: mozLoop,
+      isDesktop: true
     });
   });
 
@@ -98,10 +99,12 @@ describe("loop.OTSdkDriver", function () {
       }).to.Throw(/sdk/);
     });
 
-    it("should initialize the connectionStartTime to 'uninitialized'", function() {
-      var driver = new loop.OTSdkDriver({sdk: sdk, dispatcher: dispatcher, mozLoop: mozLoop});
+    it("should set the two-way media start time to 'uninitialized'", function() {
+      var driver = new loop.OTSdkDriver(
+        {sdk: sdk, dispatcher: dispatcher, mozLoop: mozLoop, isDesktop: true});
 
-      expect(driver.connectionStartTime).to.eql(driver.CONNECTION_START_TIME_UNINITIALIZED);
+      expect(driver._getTwoWayMediaStartTime()).to.
+        eql(driver.CONNECTION_START_TIME_UNINITIALIZED);
     });
   });
 
@@ -331,7 +334,7 @@ describe("loop.OTSdkDriver", function () {
       driver.session = session;
       var startTime = 1;
       var endTime = 3;
-      driver.connectionStartTime = startTime;
+      driver._setTwoWayMediaStartTime(startTime);
       sandbox.stub(performance, "now").returns(endTime);
       sandbox.stub(driver, "_noteConnectionLengthIfNeeded");
 
@@ -341,16 +344,17 @@ describe("loop.OTSdkDriver", function () {
                               endTime);
     });
 
-    it("should reset the connectionStartTime", function() {
+    it("should reset the two-way media connection start time", function() {
       driver.session = session;
       var startTime = 1;
-      driver.connectionStartTime = startTime;
+      driver._setTwoWayMediaStartTime(startTime);
       sandbox.stub(performance, "now");
       sandbox.stub(driver, "_noteConnectionLengthIfNeeded");
 
       driver.disconnectSession();
 
-      expect(driver.connectionStartTime).to.eql(driver.CONNECTION_START_TIME_UNINITIALIZED);
+      expect(driver._getTwoWayMediaStartTime()).to.
+        eql(driver.CONNECTION_START_TIME_UNINITIALIZED);
     });
   });
 
@@ -358,15 +362,15 @@ describe("loop.OTSdkDriver", function () {
     var startTimeMS;
     beforeEach(function() {
       startTimeMS = 1;
-      driver.connectionStartTime = startTimeMS;
+      driver._setTwoWayMediaStartTime(startTimeMS);
     });
 
-
-    it("should set connectionStartTime to CONNECTION_START_TIME_ALREADY_NOTED", function() {
+    it("should set two-way media start time to CONNECTION_START_TIME_ALREADY_NOTED", function() {
       var endTimeMS = 3;
       driver._noteConnectionLengthIfNeeded(startTimeMS, endTimeMS);
 
-      expect(driver.connectionStartTime).to.eql(driver.CONNECTION_START_TIME_ALREADY_NOTED);
+      expect(driver._getTwoWayMediaStartTime()).to.
+        eql(driver.CONNECTION_START_TIME_ALREADY_NOTED);
     });
 
     it("should call mozLoop.noteConnectionLength with SHORTER_THAN_10S for calls less than 10s", function() {
@@ -414,6 +418,17 @@ describe("loop.OTSdkDriver", function () {
         "LOOP_TWO_WAY_MEDIA_CONN_LENGTH",
         mozLoop.TWO_WAY_MEDIA_CONN_LENGTH.MORE_THAN_5M);
     });
+
+    it("should not call mozLoop.noteConnectionLength if driver._isDesktop " +
+       "is false",
+      function() {
+        var endTimeMS = 10 * 60 * 1000;
+        driver._isDesktop = false;
+
+        driver._noteConnectionLengthIfNeeded(startTimeMS, endTimeMS);
+
+        sinon.assert.notCalled(mozLoop.telemetryAddKeyedValue);
+      });
   });
 
   describe("#forceDisconnectAll", function() {
@@ -499,7 +514,7 @@ describe("loop.OTSdkDriver", function () {
         driver.session = session;
         var startTime = 1;
         var endTime = 3;
-        driver.connectionStartTime = startTime;
+        driver._setTwoWayMediaStartTime(startTime);
         sandbox.stub(performance, "now").returns(endTime);
         sandbox.stub(driver, "_noteConnectionLengthIfNeeded");
 
@@ -543,7 +558,7 @@ describe("loop.OTSdkDriver", function () {
         driver.session = session;
         var startTime = 1;
         var endTime = 3;
-        driver.connectionStartTime = startTime;
+        driver._setTwoWayMediaStartTime(startTime);
         sandbox.stub(performance, "now").returns(endTime);
         sandbox.stub(driver, "_noteConnectionLengthIfNeeded");
 
@@ -629,14 +644,27 @@ describe("loop.OTSdkDriver", function () {
           sinon.match.hasOwn("name", "mediaConnected"));
       });
 
-      it("should store the start time when both streams are up", function() {
+      it("should store the start time when both streams are up and" +
+      " driver._isDesktop is true", function() {
         driver._publishedLocalStream = true;
         var startTime = 1;
         sandbox.stub(performance, "now").returns(startTime);
 
         session.trigger("streamCreated", {stream: fakeStream});
 
-        expect(driver.connectionStartTime).to.eql(startTime);
+        expect(driver._getTwoWayMediaStartTime()).to.eql(startTime);
+      });
+
+      it("should not store the start time when both streams are up and" +
+         " driver._isDesktop is false", function() {
+        driver._isDesktop = false ;
+        driver._publishedLocalStream = true;
+        var startTime = 73;
+        sandbox.stub(performance, "now").returns(startTime);
+
+        session.trigger("streamCreated", {stream: fakeStream});
+
+        expect(driver._getTwoWayMediaStartTime()).to.not.eql(startTime);
       });
 
 

From 98ae797c69d4e69ea77e27a12d92d3c260ad4e6f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 10:47:02 -0700
Subject: [PATCH 75/80] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/73b67adb48cd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #28965 from ath0mas/fix-l10n-default-locale

Bug 1144435 - Fix l10n meta reading to get defaultLocale

========

https://hg.mozilla.org/integration/gaia-central/rev/024a36f25b55
Author: Alexis THOMAS <fr.alexisthomas@gmail.com>
Desc: Bug 1144435 - Fix l10n meta reading to get defaultLocale
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 1afe82ac7296..afb734df3457 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "69c230da400089c4311ce82867e26f266e648c6f", 
+        "git_revision": "66558ce7f36809a20d1c721fd4d457913b09c5c7", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "8fe2bb847cc3542c215faac74246b18e99a62391", 
+    "revision": "73b67adb48cdfbba7a520d3499e9759757c8b3c5", 
     "repo_path": "integration/gaia-central"
 }

From 2d26ccb338547cdb6664a4050b965f008c37d239 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 20 Mar 2015 10:49:38 -0700
Subject: [PATCH 76/80] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator-l/sources.xml   | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/nexus-5-l/sources.xml    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 52adcdd73dd7..389c31f56eeb 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f5a867a5feee..03630ef4cd3f 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index fa5bf593ffec..47587bc2b83f 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index dec87b7ad06b..dfd6eb77c782 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index a02059caf55c..9fb90115ade8 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f5a867a5feee..03630ef4cd3f 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b3dead13b146..7712167ece2b 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 78957e5a350b..21e478aa8a8f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 55758f716d21..4b148d9c2ea8 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="b685e3aab4fde7624d78993877a8f7910f2a5f06"/>
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 49928d1b8a5e..d729cbcab84c 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="69c230da400089c4311ce82867e26f266e648c6f"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="66558ce7f36809a20d1c721fd4d457913b09c5c7"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="86cd7486d8e50eaac8ef6fe2f51f09d25194577b"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

From 7fd14d50255e95330832430845c7557a8bad890f Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 20 Mar 2015 11:08:51 -0700
Subject: [PATCH 77/80] Bug 1131414 (part 1) - add a pref to indicate if sync
 is disabled in its entirety. r=rnewman

---
 services/sync/modules/browserid_identity.js   |  2 +-
 services/sync/modules/service.js              | 21 +++++++++++++++++--
 services/sync/services-sync.js                |  5 +++++
 .../sync/tests/unit/test_service_login.js     |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/services/sync/modules/browserid_identity.js b/services/sync/modules/browserid_identity.js
index ff14c94f5140..7b4c7ef68896 100644
--- a/services/sync/modules/browserid_identity.js
+++ b/services/sync/modules/browserid_identity.js
@@ -282,7 +282,7 @@ this.BrowserIDManager.prototype = {
       // The exception is when we've initialized with a user that needs to
       // reauth with the server - in that case we will also get here, but
       // should have the same identity.
-      // initializeWithCurrentIdentity will throw and log if these contraints
+      // initializeWithCurrentIdentity will throw and log if these constraints
       // aren't met, so just go ahead and do the init.
       this.initializeWithCurrentIdentity(true);
       break;
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 73719e0ced8e..2d28a26da622 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -305,6 +305,21 @@ Sync11Service.prototype = {
     return false;
   },
 
+  // The global "enabled" state comes from prefs, and will be set to false
+  // whenever the UI that exposes what to sync finds all Sync engines disabled.
+  get enabled() {
+    return Svc.Prefs.get("enabled");
+  },
+  set enabled(val) {
+    // There's no real reason to impose this other than to catch someone doing
+    // something we don't expect with bad consequences - all setting of this
+    // pref are in the UI code and external to this module.
+    if (val) {
+      throw new Error("Only disabling via this setter is supported");
+    }
+    Svc.Prefs.set("enabled", val);
+  },
+
   /**
    * Prepare to initialize the rest of Weave after waiting a little bit
    */
@@ -334,8 +349,6 @@ Sync11Service.prototype = {
     this._clusterManager = this.identity.createClusterManager(this);
     this.recordManager = new RecordManager(this);
 
-    this.enabled = true;
-
     this._registerEngines();
 
     let ua = Cc["@mozilla.org/network/protocol;1?name=http"].
@@ -1245,6 +1258,10 @@ Sync11Service.prototype = {
   },
 
   sync: function sync() {
+    if (!this.enabled) {
+      this._log.debug("Not syncing as Sync is disabled.");
+      return;
+    }
     let dateStr = new Date().toLocaleFormat(LOG_DATE_FORMAT);
     this._log.debug("User-Agent: " + SyncStorageRequest.prototype.userAgent);
     this._log.info("Starting sync at " + dateStr);
diff --git a/services/sync/services-sync.js b/services/sync/services-sync.js
index b956086e4f42..26cd6ad3f85b 100644
--- a/services/sync/services-sync.js
+++ b/services/sync/services-sync.js
@@ -24,6 +24,11 @@ pref("services.sync.scheduler.sync11.singleDeviceInterval", 86400); // 1 day
 
 pref("services.sync.errorhandler.networkFailureReportTimeout", 1209600); // 2 weeks
 
+// A "master" pref for Sync being enabled. Will be set to false if the sync
+// customization UI finds all our builtin engines disabled (and addons are
+// free to force this to true if they have their own engine)
+pref("services.sync.enabled", true);
+// Our engines.
 pref("services.sync.engine.addons", true);
 pref("services.sync.engine.bookmarks", true);
 pref("services.sync.engine.history", true);
diff --git a/services/sync/tests/unit/test_service_login.js b/services/sync/tests/unit/test_service_login.js
index 42c163915f02..62f406fe3db0 100644
--- a/services/sync/tests/unit/test_service_login.js
+++ b/services/sync/tests/unit/test_service_login.js
@@ -183,7 +183,7 @@ add_test(function test_login_on_sync() {
     // This test exercises these two branches.
 
     _("We're ready to sync if locked.");
-    Service.enabled = true;
+    Svc.Prefs.set("enabled", true);
     Services.io.offline = false;
     Service.scheduler.checkSyncStatus();
     do_check_true(scheduleCalled);

From d429535c227c1eeddc2df6019aaa65990bf93ad1 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Fri, 20 Mar 2015 11:08:51 -0700
Subject: [PATCH 78/80] Bug 1131414 (part 2) - add the reading-list engine to
 Sync prefs. r=adw

---
 browser/app/profile/firefox.js                |  4 ++-
 browser/base/content/sync/customize.js        | 23 +++++++++++++++++
 browser/base/content/sync/customize.xul       |  7 ++++++
 .../components/preferences/in-content/sync.js | 18 +++++++++++++
 .../preferences/in-content/sync.xul           | 12 ++++++++-
 browser/components/preferences/sync.js        | 25 +++++++++++++++++++
 browser/components/preferences/sync.xul       | 16 +++++++++++-
 browser/components/readinglist/Scheduler.jsm  |  4 +++
 8 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index d4feb700958c..8fa1f7bad0a5 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1879,5 +1879,7 @@ pref("dom.ipc.reportProcessHangs", true);
 pref("reader.parse-on-load.enabled", false);
 #endif
 
-// Disable ReadingList by default.
+// Disable ReadingList browser UI by default.
 pref("browser.readinglist.enabled", false);
+// Enable the readinglist engine by default.
+pref("readinglist.scheduler.enabled", true);
diff --git a/browser/base/content/sync/customize.js b/browser/base/content/sync/customize.js
index b3178036d3ca..7d97cdacd4e9 100644
--- a/browser/base/content/sync/customize.js
+++ b/browser/base/content/sync/customize.js
@@ -4,8 +4,31 @@
 
 "use strict";
 
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+addEventListener("load", function () {
+  // unhide the reading-list engine if readinglist is enabled (note this
+  // dialog is only used with FxA sync, so no special action is needed
+  // for legacy sync.)
+  if (Services.prefs.getBoolPref("browser.readinglist.enabled")) {
+    document.getElementById("readinglist-engine").removeAttribute("hidden");
+  }
+});
+
 addEventListener("dialogaccept", function () {
   let pane = document.getElementById("sync-customize-pane");
+  // First determine what the preference for the "global" sync enabled pref
+  // should be based on the engines selected.
+  let prefElts = pane.querySelectorAll("preferences > preference");
+  let syncEnabled = false;
+  for (let elt of prefElts) {
+    if (elt.name.startsWith("services.sync.") && elt.value) {
+      syncEnabled = true;
+      break;
+    }
+  }
+  Services.prefs.setBoolPref("services.sync.enabled", syncEnabled);
+  // and write the individual prefs.
   pane.writePreferences(true);
   window.arguments[0].accepted = true;
 });
diff --git a/browser/base/content/sync/customize.xul b/browser/base/content/sync/customize.xul
index d95536d9ac96..705889deaab1 100644
--- a/browser/base/content/sync/customize.xul
+++ b/browser/base/content/sync/customize.xul
@@ -27,6 +27,8 @@
       <preference id="engine.passwords" name="services.sync.engine.passwords" type="bool"/>
       <preference id="engine.addons"    name="services.sync.engine.addons"    type="bool"/>
       <preference id="engine.prefs"     name="services.sync.engine.prefs"     type="bool"/>
+      <!-- non Sync-Engine engines -->
+      <preference id="engine.readinglist" name="readinglist.scheduler.enabled" type="bool"/>
     </preferences>
 
     <label id="sync-customize-title" value="&syncCustomize.title;"/>
@@ -51,6 +53,11 @@
       <checkbox label="&engine.history.label;"
                 accesskey="&engine.history.accesskey;"
                 preference="engine.history"/>
+      <checkbox id="readinglist-engine"
+                label="&engine.readinglist.label;"
+                accesskey="&engine.readinglist.accesskey;"
+                preference="engine.readinglist"
+                hidden="true"/>
       <checkbox label="&engine.addons.label;"
                 accesskey="&engine.addons.accesskey;"
                 preference="engine.addons"/>
diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js
index dfe9eb1f55f4..6fea9443af55 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -237,6 +237,11 @@ let gSyncPane = {
     // service.fxAccountsEnabled is false iff sync is already configured for
     // the legacy provider.
     if (service.fxAccountsEnabled) {
+      // unhide the reading-list engine if readinglist is enabled (note we do
+      // it here as it must remain disabled for legacy sync users)
+      if (Services.prefs.getBoolPref("browser.readinglist.enabled")) {
+        document.getElementById("readinglist-engine").removeAttribute("hidden");
+      }
       // determine the fxa status...
       this.page = PAGE_PLEASE_WAIT;
       fxAccounts.getSignedInUser().then(data => {
@@ -372,6 +377,19 @@ let gSyncPane = {
     document.getElementById("sync-migration-deck").selectedIndex = selIndex;
   },
 
+  // Called whenever one of the sync engine preferences is changed.
+  onPreferenceChanged: function() {
+    let prefElts = document.querySelectorAll("#syncEnginePrefs > preference");
+    let syncEnabled = false;
+    for (let elt of prefElts) {
+      if (elt.name.startsWith("services.sync.") && elt.value) {
+        syncEnabled = true;
+        break;
+      }
+    }
+    Services.prefs.setBoolPref("services.sync.enabled", syncEnabled);
+  },
+
   startOver: function (showDialog) {
     if (showDialog) {
       let flags = Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING +
diff --git a/browser/components/preferences/in-content/sync.xul b/browser/components/preferences/in-content/sync.xul
index 10347314213f..4f1ae7029fdc 100644
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -4,7 +4,8 @@
 
 <!-- Sync panel -->
 
-<preferences hidden="true" data-category="paneSync">
+<preferences id="syncEnginePrefs" hidden="true" data-category="paneSync"
+             onchange="gSyncPane.onPreferenceChanged();">
   <preference id="engine.addons"
               name="services.sync.engine.addons"
               type="bool"/>
@@ -23,6 +24,10 @@
   <preference id="engine.passwords"
               name="services.sync.engine.passwords"
               type="bool"/>
+  <!-- non Sync-Engine engines -->
+  <preference id="engine.readinglist"
+              name="readinglist.scheduler.enabled"
+              type="bool"/>
 </preferences>
 
 <script type="application/javascript"
@@ -290,6 +295,11 @@
           <checkbox label="&engine.history.label;"
                     accesskey="&engine.history.accesskey;"
                     preference="engine.history"/>
+          <checkbox id="readinglist-engine"
+                    label="&engine.readinglist.label;"
+                    accesskey="&engine.readinglist.accesskey;"
+                    preference="engine.readinglist"
+                    hidden="true"/>
           <checkbox label="&engine.addons.label;"
                     accesskey="&engine.addons.accesskey;"
                     preference="engine.addons"/>
diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index c27262c86e3f..88970da6dc87 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -54,6 +54,26 @@ let gSyncPane = {
   },
 
   init: function () {
+    // We use a preference observer to notice changes to the Sync engines
+    // enabled state - other techniques are problematic due to the window
+    // being instant-apply on Mac etc but modal on Windows.
+    let prefObserver = () => {
+      // If all our Sync engines are disabled we flip the "master" Sync-enabled pref.
+      let prefElts = document.querySelectorAll("#syncEnginePrefs > preference");
+      let syncEnabled = false;
+      for (let elt of prefElts) {
+        if (elt.name.startsWith("services.sync.") && elt.value) {
+          syncEnabled = true;
+          break;
+        }
+      }
+      Services.prefs.setBoolPref("services.sync.enabled", syncEnabled);
+    }
+    Services.prefs.addObserver("services.sync.engine.", prefObserver, false);
+    window.addEventListener("unload", () => {
+      Services.prefs.removeObserver("services.sync.engine.", prefObserver);
+    }, false);
+
     // If the Service hasn't finished initializing, wait for it.
     let xps = Components.classes["@mozilla.org/weave/service;1"]
                                 .getService(Components.interfaces.nsISupports)
@@ -136,6 +156,11 @@ let gSyncPane = {
     // service.fxAccountsEnabled is false iff sync is already configured for
     // the legacy provider.
     if (service.fxAccountsEnabled) {
+      // unhide the reading-list engine if readinglist is enabled (note we do
+      // it here as it must remain disabled for legacy sync users)
+      if (Services.prefs.getBoolPref("browser.readinglist.enabled")) {
+        document.getElementById("readinglist-engine").removeAttribute("hidden");
+      }
       // determine the fxa status...
       this.page = PAGE_PLEASE_WAIT;
       fxAccounts.getSignedInUser().then(data => {
diff --git a/browser/components/preferences/sync.xul b/browser/components/preferences/sync.xul
index 87c6d0d9ddb5..4f89e25b4cd4 100644
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -21,13 +21,15 @@
             helpTopic="prefs-weave"
             onpaneload="gSyncPane.init()">
 
-    <preferences>
+    <preferences id="syncEnginePrefs">
       <preference id="engine.addons"    name="services.sync.engine.addons"    type="bool"/>
       <preference id="engine.bookmarks" name="services.sync.engine.bookmarks" type="bool"/>
       <preference id="engine.history"   name="services.sync.engine.history"   type="bool"/>
       <preference id="engine.tabs"      name="services.sync.engine.tabs"      type="bool"/>
       <preference id="engine.prefs"     name="services.sync.engine.prefs"     type="bool"/>
       <preference id="engine.passwords" name="services.sync.engine.passwords" type="bool"/>
+      <!-- non Sync-Engine engines -->
+      <preference id="engine.readinglist" name="readinglist.scheduler.enabled" type="bool"/>
     </preferences>
 
 
@@ -285,21 +287,33 @@
               <vbox>
                 <checkbox label="&engine.tabs.label;"
                           accesskey="&engine.tabs.accesskey;"
+                          onsynctopreference="gSyncPane.onPreferenceChanged();"
                           preference="engine.tabs"/>
                 <checkbox label="&engine.bookmarks.label;"
                           accesskey="&engine.bookmarks.accesskey;"
+                          onsynctopreference="gSyncPane.onPreferenceChanged();"
                           preference="engine.bookmarks"/>
                 <checkbox label="&engine.passwords.label;"
                           accesskey="&engine.passwords.accesskey;"
+                          onsynctopreference="gSyncPane.onPreferenceChanged();"
                           preference="engine.passwords"/>
                 <checkbox label="&engine.history.label;"
                           accesskey="&engine.history.accesskey;"
+                          onsynctopreference="gSyncPane.onPreferenceChanged(this);"
                           preference="engine.history"/>
+                <!-- onpreferencechanged not needed for the readinglist engine -->
+                <checkbox id="readinglist-engine"
+                          label="&engine.readinglist.label;"
+                          accesskey="&engine.readinglist.accesskey;"
+                          preference="engine.readinglist"
+                          hidden="true"/>
                 <checkbox label="&engine.addons.label;"
                           accesskey="&engine.addons.accesskey;"
+                          onsynctopreference="gSyncPane.onPreferenceChanged();"
                           preference="engine.addons"/>
                 <checkbox label="&engine.prefs.label;"
                           accesskey="&engine.prefs.accesskey;"
+                          onsynctopreference="gSyncPane.onPreferenceChanged();"
                           preference="engine.prefs"/>
               </vbox>
               <spacer/>
diff --git a/browser/components/readinglist/Scheduler.jsm b/browser/components/readinglist/Scheduler.jsm
index 8acfc13dbabe..028aa893d78f 100644
--- a/browser/components/readinglist/Scheduler.jsm
+++ b/browser/components/readinglist/Scheduler.jsm
@@ -172,6 +172,10 @@ InternalScheduler.prototype = {
 
   // canSync indicates if we can currently sync.
   _canSync(ignoreBlockingErrors = false) {
+    if (!prefs.get("enabled")) {
+      this.log.info("canSync=false - syncing is disabled");
+      return false;
+    }
     if (Services.io.offline) {
       this.log.info("canSync=false - we are offline");
       return false;

From 374a3df1794ce943c4b51d1707e2c2bd96657018 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 20 Mar 2015 11:20:11 -0700
Subject: [PATCH 79/80] Bug 1123518 - [ReadingList] Display article preview
 image in the Reading List sidebar. r=florian

---
 browser/branding/aurora/content/jar.mn        |    1 +
 .../branding/aurora/content/silhouette-40.svg |   25 +
 browser/branding/nightly/content/jar.mn       |    1 +
 .../nightly/content/silhouette-40.svg         | 1359 +++++++++++++++++
 browser/branding/official/content/jar.mn      |    1 +
 .../official/content/silhouette-40.svg        |   25 +
 browser/branding/unofficial/content/jar.mn    |    1 +
 .../unofficial/content/silhouette-40.svg      | 1359 +++++++++++++++++
 .../components/readinglist/ReadingList.jsm    |    8 +
 browser/components/readinglist/sidebar.js     |    6 +
 .../themes/shared/readinglist/sidebar.inc.css |    6 +-
 11 files changed, 2791 insertions(+), 1 deletion(-)
 create mode 100644 browser/branding/aurora/content/silhouette-40.svg
 create mode 100644 browser/branding/nightly/content/silhouette-40.svg
 create mode 100644 browser/branding/official/content/silhouette-40.svg
 create mode 100644 browser/branding/unofficial/content/silhouette-40.svg

diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn
index dc07b3d8f6a4..f123f48fdfaa 100644
--- a/browser/branding/aurora/content/jar.mn
+++ b/browser/branding/aurora/content/jar.mn
@@ -16,6 +16,7 @@ browser.jar:
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.png      (identity-icons-brand.png)
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
+  content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
 #ifdef MOZ_METRO
   content/branding/metro-about.css               (metro-about.css)
diff --git a/browser/branding/aurora/content/silhouette-40.svg b/browser/branding/aurora/content/silhouette-40.svg
new file mode 100644
index 000000000000..7f96dc91c3ce
--- /dev/null
+++ b/browser/branding/aurora/content/silhouette-40.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+  x="0px" y="0px" viewBox="-45 31 40 40"
+  enable-background="new -45 31 40 40">
+  <path fill="#CCCCCC" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3
+    c0.1-0.9,0-1.9-0.1-2.9c-0.3-1.5-1.4-2.8-2-3.2c0,0,0.1,0,0.1,0.1c-0.1-0.1-0.1-0.1-0.1-0.1s0,0.1,0.1,0.4c-0.7-1.1-1.6-1.5-1.6-1.5
+    s0,0.2,0.1,0.5c-2-1.9-4.7-3-7.6-3c-3,0-5.7,1.2-7.8,3.1c0.1,0.1,0.2,0.3,0.4,0.5c0,0,0.8-0.1,1.7-0.1c1.7-1.2,3.6-1.8,5.7-1.8
+    c2.6,0,5.1,1.1,7,3c-0.2-0.1-0.1,0,0,0.1c-0.6-0.4-1.2-0.8-1.7-0.8c1,0.8,2.6,2.7,2.4,6.2c-0.3-0.6-0.6-1-0.9-1.3
+    c0.4,3.5,0,4.2-0.2,5.1c0-0.4-0.2-0.7-0.3-0.9c0,0,0,1.1-0.7,2.6c-0.5,1.2-1.1,1.5-1.3,1.5c-0.2,0-0.1-0.2-0.1-0.4
+    c0,0-0.4,0.2-0.7,0.6c-0.3,0.4-0.6,0.8-0.8,0.6c0.1-0.1,0.2-0.3,0.3-0.4c-0.1,0.1-0.5,0.4-1.2,0.5c-0.3,0-1.6,0.3-3.3-0.6
+    c0.3,0,0.6-0.1,0.9,0.1c-0.3-0.3-1-0.3-1.5-0.4c-0.5-0.4-1.1-1-1.4-1.4c1.3,0.3,2.8,0.1,3.6-0.5s1.3-1,1.8-0.9
+    c0.4,0.1,0.7-0.4,0.4-0.8c-0.3-0.4-1.2-1-2.3-0.7c-0.8,0.2-1.8,1.1-3.3,0.2c-1.3-0.8-1.3-1.4-1.3-1.8c0-0.3,0.2-0.7,0.5-0.8
+    c0.2,0.1,0.3,0.1,0.3,0.1s-0.1-0.1-0.1-0.2l0,0c0.1,0,0.4,0.2,0.6,0.2c0.2,0.1,0.3,0.2,0.3,0.2s0,0,0-0.1c0,0-0.1-0.2-0.3-0.3l0,0
+    c0.1,0,0.2,0.1,0.4,0.2c0-0.2,0.1-0.4,0.1-0.7c0-0.2,0-0.3-0.1-0.4c-0.1-0.1,0-0.1,0.1,0c0-0.1,0-0.1-0.1-0.2l0,0c0,0,0,0,0-0.1
+    c0.2-0.3,1.8-1.2,1.9-1.3c0.2-0.1,0.3-0.3,0.4-0.5c0.2-0.1,0.3-0.5,0.3-0.8c0-0.1-0.2-0.3-0.4-0.3c-0.1,0-0.4-0.1-0.6,0l0,0
+    c-0.3,0-0.7,0-1.2,0s-0.8-0.3-1-0.6c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.2-0.1-0.2c0.2-0.8,0.7-1.5,1.4-2.1c0,0-0.2,0-0.1,0
+    c0,0,0.3-0.2,0.4-0.2c0.1,0-0.3-0.1-0.6-0.1c-0.5,0.2-0.6,0.2-0.8,0.3c0.1-0.1,0.3-0.2,0.2-0.2c-0.3,0.1-0.7,0.4-1.1,0.6v-0.1
+    c-0.2,0.1-0.6,0.4-0.7,0.7c0-0.1,0-0.1,0-0.1c-0.1,0-0.2,0.2-0.3,0.3l0,0c-1.1-0.3-2-0.2-2.8,0c-0.2-0.1-0.6-0.5-0.9-1
+    c0,0,0,0.1-0.1,0.1c-0.1-0.4-0.3-0.9-0.3-1.3v-0.1c0,0-0.1,0.1-0.3,0.3c-0.1,0.2-0.2,0.3-0.2,0.5c0,0.1-0.1,0.2-0.1,0.2v-0.2
+    c0,0.1-0.1,0.2-0.2,0.3c0,0.2,0,0.3-0.1,0.4l0,0c0,0,0-0.2,0-0.1c-0.1,0.2-0.2,0.5-0.2,0.8c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.7,0,1.2
+    c0,0.1,0,0.1,0,0.2c-0.3,0.4-0.5,0.7-0.6,0.9c-0.4,0.7-0.7,1.8-1,3.5c0,0,0.2-0.6,0.6-1.3l0,0c-0.3,0.9-0.5,2.3-0.4,4.4
+    c0-0.1,0.1-0.6,0.2-1.3c0.1,1.4,0.5,3.1,1.5,5c0.8,1.4,1.7,2.4,2.7,3.2c0.2,0.2,0.4,0.3,0.6,0.5c1.3,1,3.3,2.1,5,2.4
+    c-0.6-0.2-1-0.5-1-0.5s2,0.7,3.5,0.6c-0.5-0.1-0.6-0.3-0.6-0.3s4.2,0.2,6.4-1.5c0.5-0.4,0.8-0.8,0.9-1.2c0.6-0.4,1.3-0.8,2-1.6
+    c1.2-1.2,1.3-2.1,1.4-3v0.1C-14,55.2-14,54.9-14.1,54.7z"/>
+  </svg>
diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn
index dc07b3d8f6a4..f123f48fdfaa 100644
--- a/browser/branding/nightly/content/jar.mn
+++ b/browser/branding/nightly/content/jar.mn
@@ -16,6 +16,7 @@ browser.jar:
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.png      (identity-icons-brand.png)
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
+  content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
 #ifdef MOZ_METRO
   content/branding/metro-about.css               (metro-about.css)
diff --git a/browser/branding/nightly/content/silhouette-40.svg b/browser/branding/nightly/content/silhouette-40.svg
new file mode 100644
index 000000000000..929295ad612a
--- /dev/null
+++ b/browser/branding/nightly/content/silhouette-40.svg
@@ -0,0 +1,1359 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="-45 31 40 40"
+ enable-background="new -45 31 40 40">
+ <path fill="#CCCCCC" d="M-25,62.991c-6.622,0-11.991-5.369-11.991-11.991S-31.622,39.009-25,39.009S-13.009,44.378-13.009,51
+  S-18.378,62.991-25,62.991z M-34.439,48.549c-0.002,0.007-0.004,0.013-0.006,0.02c0.002-0.004,0.006-0.006,0.007-0.01
+  C-34.437,48.555-34.438,48.552-34.439,48.549z M-34.259,47.956c-0.001-0.006-0.003-0.005-0.002-0.012l0,0
+  c-0.001,0.004-0.003,0.008-0.004,0.012l0.008,0.006C-34.258,47.96-34.258,47.958-34.259,47.956z M-34.245,48.067
+  c-0.02,0.006-0.04,0.012-0.06,0.019c-0.026,0.084-0.054,0.168-0.078,0.254c0.004-0.002,0.007-0.004,0.01-0.008
+  c0.007-0.006,0.013-0.014,0.019-0.021c0.008-0.007,0.009-0.014,0.011-0.023c0.003-0.009,0.003-0.01,0.008-0.017
+  c0.01-0.012,0.006-0.037,0.005-0.051c0-0.011-0.007-0.015,0-0.024c0.005-0.007,0.012-0.014,0.017-0.019
+  c0.011-0.01,0.026-0.015,0.039-0.022c0.007-0.003,0.013-0.008,0.017-0.014c0.003-0.005,0.004-0.011,0.007-0.017
+  c0.007-0.014,0.008-0.027,0.008-0.044C-34.242,48.074-34.243,48.071-34.245,48.067z M-16.736,45.824
+  c0.001,0.012,0.002,0.024,0.007,0.036c0.006,0.017,0.012,0.034,0.011,0.054c0,0.017,0.007,0.032,0.011,0.049
+  c0.004,0.024,0.013,0.043,0.024,0.064c0.004,0.009,0.009,0.017,0.013,0.026c0.008,0.012,0.014,0.025,0.021,0.038
+  c0.009,0.017,0.014,0.034,0.022,0.051c0.004,0.008,0.006,0.016,0.008,0.024c0.002,0.005,0.003,0.013,0.007,0.017
+  c-0.02-0.021-0.027-0.053-0.042-0.077c-0.013-0.021-0.029-0.04-0.041-0.061c-0.009-0.016-0.021-0.028-0.023-0.045
+  c-0.002-0.015-0.003-0.029-0.007-0.042c-0.003-0.007-0.004-0.012-0.009-0.019c-0.004-0.007-0.011-0.011-0.015-0.018
+  c-0.01-0.015-0.018-0.034-0.025-0.051c-0.01-0.022-0.015-0.05-0.037-0.064c0.004,0.004,0.008,0.014,0.009,0.02
+  c0.002,0.007,0.005,0.015,0.005,0.022c0,0.013-0.007,0.013-0.014,0.004c-0.005-0.006-0.007-0.015-0.01-0.023
+  c-0.001-0.003-0.005-0.009-0.005-0.012c-0.001-0.004,0-0.007-0.001-0.01c-0.001-0.006-0.006-0.013-0.009-0.019
+  c-0.004-0.01-0.007-0.018-0.014-0.027c-0.006-0.008-0.012-0.014-0.016-0.025c-0.005-0.014-0.007-0.028-0.017-0.04
+  s-0.018-0.001-0.028,0.005c-0.006,0.004-0.014,0.005-0.022,0.008c-0.008,0.002-0.015,0.005-0.023,0.007
+  c-0.006,0.002-0.012,0.003-0.018,0.005c-0.003,0.001-0.004,0.002-0.008,0.003c-0.004,0-0.008-0.001-0.012,0
+  c-0.01,0.001-0.018,0.005-0.029,0.003c-0.003-0.001-0.005-0.003-0.008-0.003c-0.004-0.001-0.008-0.001-0.012,0
+  c-0.02,0.001-0.016,0.025-0.012,0.039c0.004,0.017,0.013,0.032,0.021,0.047c0.001,0.004,0.004,0.008,0.006,0.012
+  c0.001,0.004-0.001,0.007,0,0.011c0.002,0.009,0.006,0.017,0.004,0.027c-0.001,0.009-0.003,0.012-0.01,0.016
+  c-0.008,0.004-0.01,0.004-0.006,0.014c0.003,0.006,0.008,0.013,0.009,0.019c0.001,0.007,0.001,0.015,0.003,0.022
+  c0.004,0.017,0.012,0.034,0.02,0.049c0.005,0.008,0.014,0.031-0.004,0.019c-0.012-0.007-0.019-0.022-0.026-0.033
+  c-0.004-0.007-0.009-0.011-0.016-0.015c-0.006-0.003-0.013-0.005-0.019-0.009c-0.011-0.007-0.011-0.014-0.011-0.026
+  c0-0.007,0-0.015-0.008-0.019c-0.006-0.003-0.015-0.003-0.023-0.006c-0.005-0.002-0.011-0.004-0.015-0.007
+  c0.009,0.008,0.012,0.018,0.015,0.028c0.007,0.02,0.016,0.038,0.027,0.056c0.009,0.016,0.02,0.022,0.034,0.032
+  c0.011,0.008,0.022,0.024,0.029,0.035c0.008,0.01,0.015,0.019,0.024,0.028c0.009,0.009,0.019,0.015,0.025,0.027
+  c0.008,0.014,0.01,0.027,0.013,0.042c0.004,0.013,0.003,0.027,0.003,0.041c0,0.009,0.001,0.018-0.001,0.026
+  c0,0.003-0.002,0.005-0.002,0.008c-0.001,0.004,0,0.008,0,0.012c0,0.013,0,0.027,0,0.041c0,0.027,0.021,0.046,0.029,0.069
+  c0.008,0.023,0.006,0.053,0.005,0.079c-0.001,0.004-0.002,0.006-0.003,0.011c-0.002,0.005,0,0.009-0.001,0.014
+  c-0.001,0.005-0.003,0.008-0.004,0.012c0,0.003,0,0.006,0,0.008c0,0.004-0.003,0.004-0.004,0.007c-0.001,0.003,0,0.008,0,0.011
+  c-0.001,0.004-0.003,0.002-0.003,0.008c0.002,0.003,0.003,0.005,0.003,0.008c0.005,0.013,0.015,0.032,0.027,0.041
+  c0.005,0.003,0.012,0.004,0.019,0.004s0.013,0.005,0.018,0.012c0,0.002,0.001,0.004,0.001,0.006
+  c0.003,0.002,0.005,0.005,0.006,0.008c0.002,0.004,0.003,0.011,0.004,0.015c0.004,0.017,0.01,0.029,0.019,0.042
+  c0.011,0.015,0.021,0.018,0.039,0.019c0.016,0.001,0.029,0.009,0.042,0.02c0.006,0.005,0.011,0.013,0.018,0.018
+  c0.005,0.003,0.013,0.004,0.018,0.007c0.009,0.004,0.018,0.006,0.028,0.009c0.008,0.003,0.017,0.005,0.026,0.007
+  c0.007,0.001,0.015-0.001,0.023,0.001c0.007,0.002,0.014,0.006,0.022,0.006c0.005,0.001,0.018-0.002,0.022,0.001
+  c0.006,0.004,0.02,0.036,0.03,0.029c0.003-0.002,0.001-0.019,0.001-0.022c0-0.009,0.004-0.018,0.004-0.027
+  c0-0.005-0.001-0.01,0.001-0.015c0.001-0.004,0.003-0.006,0.003-0.011c-0.001-0.007-0.005-0.017-0.008-0.023
+  c-0.012-0.023,0.022-0.001,0.018-0.021c0-0.003-0.006-0.009-0.008-0.012c-0.002-0.005-0.003-0.001-0.002-0.009
+  c0.002-0.009,0.003-0.016,0.003-0.026c0-0.009,0-0.017-0.003-0.026c-0.003-0.007-0.009-0.013-0.011-0.02
+  c-0.004-0.011,0.006-0.019,0-0.029c-0.003-0.007-0.008-0.01-0.011-0.015c-0.004-0.006-0.004-0.016-0.005-0.023
+  c0-0.008-0.005-0.014-0.004-0.021c0.003,0.003,0.005,0.007,0.008,0.01c0.002,0.001,0.004,0.003,0.007,0.004
+  c0,0.002,0.001,0.004,0.001,0.006c0.003,0.005,0.011,0.019,0.019,0.016c0.011-0.002-0.009-0.032-0.013-0.037
+  c-0.008-0.01-0.017-0.018-0.023-0.03c-0.006-0.014-0.009-0.028-0.013-0.042c0.007,0.002,0.015,0.019,0.019,0.026
+  c0.005,0.007,0.012,0.012,0.017,0.02c0.009,0.013,0.017,0.029,0.023,0.044c0.002,0.006,0.001,0.013,0.005,0.019
+  c0.004,0.005,0.009,0.011,0.014,0.015c0.006,0.006,0.015,0.012,0.019,0.02c0.003,0.006,0.004,0.015,0.004,0.022
+  c0,0.005,0,0.01,0,0.015c0.001,0.004,0.002,0.005,0.003,0.008c0.005,0.018,0.017,0.031,0.025,0.049
+  c0.004,0.009,0.006,0.02,0.009,0.03c0.003,0.008,0.006,0.014,0.01,0.021c0.007,0.016,0.017,0.032,0.026,0.047
+  c0.005,0.008,0.007,0.017,0.01,0.026c0.003,0.008,0.008,0.017,0.008,0.025c-0.006-0.007-0.016-0.008-0.022-0.014
+  c-0.004-0.004-0.007-0.017-0.011-0.018c-0.007,0.022,0.013,0.046,0.022,0.064c0.006,0.013,0.012,0.028,0.017,0.041
+  c0.004,0.008,0.007,0.016,0.01,0.023c0.003,0.008,0.01,0.013,0.014,0.019c0.01,0.013,0.019,0.033,0.019,0.049
+  c0,0.015,0,0.03,0,0.045c0,0.015,0,0.033-0.008,0.045c-0.005,0.006-0.01,0.015-0.018,0.016c-0.006,0.001-0.017,0.001-0.023,0
+  s-0.009-0.004-0.015-0.004c-0.005,0-0.007,0.003-0.012,0.003c-0.006,0.001-0.01-0.003-0.018-0.003c-0.015,0-0.031,0-0.043,0.01
+  c-0.006,0.006-0.009,0.014-0.018,0.013c-0.004,0-0.004-0.003-0.007-0.004c-0.003-0.001-0.007,0-0.011-0.001
+  c-0.006-0.001-0.012-0.005-0.02-0.002c-0.008,0.003-0.01,0.016-0.016,0.021c-0.006,0.006-0.02,0.011-0.028,0.008
+  c-0.003-0.001-0.005-0.005-0.008-0.006c-0.004-0.002-0.008-0.001-0.012-0.001s-0.01-0.001-0.015,0
+  c-0.007,0.001-0.01,0.005-0.016,0.008c-0.009,0.004-0.016,0.003-0.026,0.003c-0.017,0-0.037,0.003-0.053-0.006
+  c-0.013-0.008-0.018-0.02-0.025-0.032c-0.007-0.015-0.009-0.032-0.023-0.042c-0.015-0.01-0.028-0.006-0.032,0.012
+  c-0.005-0.001-0.017-0.015-0.021-0.019c-0.005-0.009-0.007-0.02-0.008-0.03c0-0.007-0.003-0.012-0.004-0.02
+  c-0.001-0.009,0.003-0.013,0.004-0.021c0.002-0.012-0.006-0.022-0.004-0.035c0.001-0.008,0.004-0.013,0.004-0.022
+  c0-0.008-0.001-0.012-0.005-0.018c-0.006-0.012-0.012-0.023-0.017-0.035c-0.005-0.015-0.011-0.026-0.024-0.037
+  c-0.008-0.008-0.016-0.017-0.026-0.023c-0.007-0.005-0.014-0.008-0.02-0.015c-0.007-0.008-0.005-0.01-0.003-0.019
+  c0.002-0.011-0.008-0.014-0.012-0.022c-0.003-0.007,0-0.008,0.001-0.016c0.003-0.018-0.018-0.021-0.03-0.027
+  c-0.01-0.004-0.024-0.005-0.033-0.012c-0.006-0.004-0.01-0.011-0.016-0.014c0.001,0-0.009-0.003-0.009-0.003
+  c-0.003-0.001-0.006-0.001-0.01-0.002c-0.008-0.002-0.015-0.007-0.023-0.009c-0.008-0.003-0.014-0.004-0.022-0.005
+  c-0.006-0.001-0.01-0.005-0.015-0.007c-0.005-0.001-0.01-0.002-0.015-0.003c-0.008-0.003-0.015-0.007-0.023-0.009
+  c-0.008-0.002-0.015-0.005-0.023-0.007c-0.005-0.001-0.01,0-0.015,0c-0.005-0.001-0.008-0.002-0.012-0.003
+  c-0.021-0.005-0.042-0.003-0.063-0.005h-0.001c-0.006,0.002-0.01,0.003-0.016,0.004c-0.005,0-0.013-0.002-0.018,0
+  c-0.006,0.001-0.007,0.004-0.015,0.004c-0.005,0-0.01-0.001-0.015,0c-0.01,0-0.021,0.006-0.03,0.011
+  c-0.008,0.004-0.016,0.007-0.023,0.013c-0.004,0.004-0.01,0.011-0.011,0.017c-0.001,0.005,0,0.01-0.001,0.015
+  c-0.002,0.009-0.005,0.018-0.007,0.027c-0.001,0.005-0.002,0.018-0.008,0.022c-0.008,0.005-0.011-0.008-0.019,0
+  c-0.005,0.006-0.007,0.016-0.007,0.023c0.001,0.01,0.006,0.016,0.003,0.026c-0.002,0.008-0.001,0.015-0.004,0.023
+  c-0.002,0.008-0.004,0.014-0.002,0.023c0.002,0.007,0.002,0.016,0.006,0.023c0.005,0.009,0.015,0.018,0.022,0.027
+  c0.006,0.008,0.011,0.016,0.016,0.025c0.004,0.008,0.007,0.012,0.002,0.02c-0.004,0.007-0.013,0.008-0.02,0.01
+  c-0.009,0.002-0.014-0.001-0.022,0.005c-0.005,0.005-0.008,0.01-0.016,0.011c-0.007,0.001-0.013-0.001-0.019-0.004
+  c-0.004-0.003-0.012-0.01-0.016-0.011c-0.006-0.001-0.008,0.003-0.014,0.004c-0.004,0-0.008-0.001-0.011-0.001
+  c-0.01,0.001-0.017,0.008-0.023,0.016c-0.006,0.006-0.009,0.01-0.007,0.018c0.002,0.008,0.006,0.014,0.01,0.02
+  c0,0.001,0,0.001,0.001,0.002c0.01,0.006,0.019,0.013,0.028,0.02c0.026,0.02,0.046,0.051,0.068,0.076
+  c0.01,0.012,0.019,0.026,0.029,0.039c0.014,0.017,0.033,0.025,0.049,0.039c0.009,0.008,0.018,0.018,0.027,0.025
+  c0.011,0.008,0.028,0.01,0.039,0.018c0.012,0.009,0.02,0.013,0.036,0.018c0.013,0.004,0.025,0.011,0.036,0.019
+  c0.008,0.006,0.023,0.021,0.026,0.031c0.002,0.007,0.002,0.012,0.005,0.019c0.005,0.009,0.014,0.017,0.024,0.023
+  c0.015,0.009,0.027,0.016,0.036,0.033c0.006,0.014,0.01,0.029,0.012,0.045c0.012,0.002,0.02,0.009,0.032,0.006
+  c0.008-0.003,0.014-0.01,0.02-0.015c0.019-0.015,0.036-0.024,0.061-0.017c0.008,0.002,0.024,0.009,0.031,0.014
+  c0.009,0.007,0.011,0.02,0.017,0.03c0.004,0.009,0.007,0.019,0.013,0.028c0.009,0.013,0.021,0.024,0.033,0.035
+  c0.017,0.016,0.038,0.036,0.045,0.06c0.006,0.024-0.011,0.048-0.004,0.073c0.004,0.012,0.012,0.024,0.016,0.035
+  c0.005,0.01,0.007,0.019,0.012,0.029c0.005,0.011,0.005,0.021,0.007,0.033c0.002,0.009,0.011,0.019,0.011,0.03
+  c0.026,0,0.022-0.06,0.022-0.076c0-0.015,0-0.025-0.004-0.039s-0.009-0.019-0.017-0.03c-0.011-0.014-0.017-0.037-0.023-0.052
+  c-0.005-0.011-0.008-0.023-0.012-0.034c-0.005-0.012-0.011-0.022-0.017-0.034c-0.008-0.015-0.028-0.048-0.015-0.064
+  c0.016-0.019,0.042,0.004,0.053,0.017c0.012,0.015,0.024,0.024,0.034,0.041c0.007,0.014,0.014,0.026,0.02,0.04
+  c0.011,0.027,0.016,0.053,0.016,0.081c0,0.012,0.001,0.024,0,0.035c-0.001,0.015-0.006,0.021,0,0.036
+  c0.011,0.03,0.026,0.059,0.036,0.09c0.007,0.022,0.012,0.041,0.016,0.064c0.002,0.013,0.008,0.02,0.004,0.035
+  c-0.003,0.013-0.008,0.027-0.01,0.04c-0.001,0.006,0.001,0.012,0,0.017c-0.001,0.007-0.005,0.011-0.006,0.018
+  c-0.001,0.006,0.001,0.012,0.001,0.018c-0.001,0.008-0.005,0.014-0.007,0.022c-0.005,0.025-0.012,0.05-0.018,0.075
+  c-0.012,0.051-0.038,0.1-0.056,0.15c-0.006,0.014-0.006,0.024-0.006,0.039c0,0.013-0.004,0.031-0.001,0.042
+  c0.003,0.01,0.011,0.018,0.013,0.029c0.002,0.015,0.004,0.026,0.011,0.04c0.002,0.004,0.003,0.007,0.005,0.011
+  c0.002,0.002,0.004,0.006,0.006,0.009c0.101,0.09,0.202,0.179,0.302,0.269c0.157-0.083,0.314-0.165,0.471-0.247
+  c0.084,0.037,0.169,0.074,0.253,0.111c-0.052,0.135-0.104,0.271-0.156,0.406c0.008,0.013,0.01,0.03,0.014,0.044
+  c0.005,0.019,0.007,0.039,0.012,0.058c0.001,0.007,0.007,0.016,0.008,0.023c0.003,0.009,0.002,0.018,0.002,0.027
+  c0,0.01,0,0.019,0,0.028c0,0.008-0.005,0.017-0.006,0.024v-0.008l-0.004-0.001c-0.003-0.008,0.001-0.017-0.001-0.026
+  c-0.002-0.01-0.006-0.016-0.006-0.027c0.001-0.017,0.004-0.039,0.001-0.055c-0.004-0.013-0.012-0.026-0.016-0.039
+  c-0.002-0.009-0.005-0.018-0.008-0.026c-0.001-0.004-0.001-0.005-0.001-0.007c-0.008,0.021-0.017,0.042-0.025,0.063
+  c0.003,0.005,0.004,0.01,0.01,0.016c0.013,0.014,0.017,0.03,0.022,0.048c0.003,0.012,0.003,0.031,0,0.043
+  c-0.002,0.009-0.005,0.013-0.004,0.022c0,0.006,0.001,0.016,0,0.022c-0.003,0.01-0.019,0.028-0.029,0.031
+  c-0.012,0.004-0.026-0.005-0.033-0.015c-0.007-0.01-0.011-0.023-0.016-0.034c-0.004,0.01-0.008,0.021-0.012,0.031
+  c0.004,0.007,0.01,0.012,0.012,0.019c0.004,0.011,0.001,0.027,0.001,0.038s0.002,0.023,0.001,0.033
+  c-0.004,0.022-0.017,0.044-0.024,0.065c-0.007,0.024-0.013,0.045-0.022,0.068c-0.008,0.023-0.011,0.046-0.022,0.068
+  c-0.008,0.02-0.013,0.046-0.02,0.066c-0.006,0.018-0.012,0.039-0.02,0.055c-0.006,0.014-0.013,0.017-0.012,0.032
+  c0,0.011,0,0.022,0,0.032c0,0.022-0.005,0.041-0.011,0.061c-0.006,0.018-0.015,0.036-0.022,0.054
+  c-0.004,0.008-0.004,0.018-0.007,0.027c-0.001,0.006-0.004,0.009-0.004,0.016c0,0.005,0.002,0.012,0,0.017
+  c-0.003,0.012-0.01,0.024-0.011,0.038c-0.001,0.013-0.005,0.025-0.005,0.038c-0.001,0.011,0,0.022,0,0.032
+  c0,0.013,0.005,0.021,0.005,0.033c0.001,0.014-0.003,0.026-0.005,0.038c-0.001,0.004-0.004,0.01-0.004,0.012
+  c-0.001,0.006,0,0.011-0.001,0.016c-0.001,0.005-0.005,0.004-0.005,0.01c0,0.004,0.004,0.012,0.005,0.017
+  c0,0.013-0.004,0.02-0.006,0.032c-0.003,0.014,0,0.031,0,0.045s-0.007,0.024-0.01,0.037c-0.002,0.011-0.004,0.022-0.007,0.033
+  c-0.001,0.005,0.001,0.011,0.001,0.016c-0.001,0.005-0.004,0.008-0.005,0.012c-0.001,0.006-0.003,0.015-0.001,0.021
+  c0.001,0.005,0.005,0.005,0.006,0.01c0.002,0.01,0,0.023,0,0.033c0,0.014-0.004,0.025-0.006,0.039c-0.002,0.01,0,0.021,0,0.032
+  c0,0.009,0.002,0.013,0.004,0.022c0.001,0.004,0,0.013,0.002,0.016c0.006,0.008,0.023,0.001,0.031-0.001
+  c0.009-0.003,0.016-0.011,0.027-0.009c0.007,0.001,0.014,0.009,0.019,0.014c0.017,0.017,0.026,0.025,0.026,0.05
+  c0,0.011,0,0.022,0,0.033c0,0.016,0,0.017,0.016,0.016c0.014,0,0.021-0.001,0.028,0.011c0.004,0.009,0.005,0.019,0.016,0.022
+  c0.008,0.003,0.021,0.001,0.026-0.007c0.006-0.009-0.004-0.021,0.005-0.029c0.008,0.019,0,0.048-0.004,0.067
+  c-0.002,0.008-0.002,0.015-0.006,0.024c0,0-0.003,0.011-0.004,0.012c-0.002,0.01-0.001,0.021-0.006,0.031
+  c-0.005,0.01-0.011,0.019-0.015,0.028c-0.006,0.012-0.015,0.018-0.024,0.028c-0.005,0.006-0.014,0.017-0.016,0.025
+  c-0.003,0.01,0.004,0.02,0.005,0.029c0.003,0.014,0.005,0.019,0.002,0.034c-0.002,0.012-0.001,0.023-0.001,0.035
+  c0,0.015-0.006,0.025-0.011,0.039c-0.008,0.022-0.017,0.042-0.022,0.065c-0.002,0.009,0,0.016-0.004,0.026
+  c-0.002,0.006-0.005,0.012-0.008,0.018c-0.005,0.009-0.011,0.017-0.015,0.027c-0.008,0.018-0.009,0.038-0.02,0.056
+  c-0.003,0.004-0.009,0.009-0.013,0.013c-0.003,0.004-0.004,0.007-0.006,0.011c-0.009,0.012-0.017,0.027-0.026,0.04
+  c-0.008,0.01-0.021,0.02-0.032,0.028c-0.01,0.008-0.019,0.018-0.028,0.026c-0.009,0.007-0.017,0.018-0.027,0.023
+  c-0.012,0.006-0.018-0.001-0.024-0.012c-0.009-0.016-0.01-0.02-0.026-0.007c-0.006,0.005-0.013,0.01-0.017,0.017
+  c-0.005,0.007-0.005,0.015-0.008,0.023c-0.003,0.004-0.006,0.005-0.007,0.01c-0.003,0.01,0.001,0.023,0,0.033
+  c-0.001,0.011-0.005,0.021-0.006,0.032c0,0.015-0.004,0.027-0.005,0.041c-0.003,0.029-0.015,0.056-0.016,0.085
+  c-0.001,0.011-0.006,0.02-0.006,0.032c0,0.01,0.003,0.024,0.001,0.033c-0.003,0.01-0.008,0.014-0.017,0.018
+  c-0.002,0.001-0.015,0.004-0.016,0.005c-0.003,0.007,0.003,0.006,0.004,0.011c0.001,0.005,0,0.01,0.001,0.015
+  c0.002,0.011,0.009,0.021,0.006,0.033c-0.002,0.005-0.005,0.005-0.006,0.01s0,0.012,0,0.017c0,0.014,0,0.02-0.007,0.032
+  c-0.006,0.012-0.013,0.02-0.015,0.033c-0.001,0.012-0.004,0.027-0.01,0.037c-0.008,0.013-0.019,0.022-0.028,0.033
+  c-0.007,0.008-0.014,0.019-0.02,0.028c-0.007,0.011-0.016,0.017-0.023,0.027c-0.007,0.01-0.013,0.017-0.017,0.028
+  c-0.004,0.011-0.007,0.022-0.012,0.032c-0.012,0.024-0.023,0.054-0.03,0.081c-0.006,0.024-0.014,0.048-0.028,0.069
+  c-0.004,0.005-0.008,0.011-0.012,0.016c0,0.009,0,0.017,0.002,0.025c0.005,0.018,0.009,0.046,0.004,0.065
+  c-0.001,0.007-0.004,0.009-0.006,0.016c0,0.005,0.001,0.011,0.001,0.017c0,0.01,0.001,0.024-0.007,0.033
+  c-0.017,0.017-0.037-0.004-0.049-0.015c-0.017-0.016-0.034-0.033-0.048-0.051c-0.004-0.006-0.01-0.011-0.015-0.017
+  c-0.007-0.008-0.013-0.022-0.021-0.028c-0.015-0.011-0.04-0.001-0.046,0.018c-0.001,0.004,0,0.011-0.001,0.016
+  c-0.001,0.008-0.005,0.013-0.004,0.022c0.001,0.012,0.006,0.02,0.006,0.033c-0.001,0.013,0.002,0.024,0.005,0.037
+  c0.002,0.007,0.008,0.016,0.01,0.024c0.004,0.024,0.011,0.045,0.023,0.069c0.021,0.044,0.03,0.086,0.047,0.131
+  c0.004,0.01,0.011,0.021,0.013,0.032c0.001,0.011,0,0.023,0,0.033c0,0.022-0.006,0.045-0.015,0.065
+  c-0.017,0.039-0.036,0.073-0.073,0.097c-0.01,0.007-0.023,0.013-0.031,0.023c-0.008,0.011-0.012,0.024-0.023,0.033
+  c-0.018,0.015-0.028,0.027-0.038,0.049c-0.004,0.009-0.011,0.019-0.018,0.027c-0.004,0.005-0.01,0.008-0.014,0.012
+  c-0.002,0.003-0.002,0.008-0.005,0.011c-0.005,0.007-0.012,0.013-0.017,0.02c-0.007,0.01-0.011,0.023-0.018,0.032
+  c-0.007,0.009-0.019,0.016-0.021,0.028c-0.001,0.006,0.001,0.011-0.001,0.017c-0.002,0.006-0.004,0.009-0.004,0.016
+  c-0.001,0.011,0.001,0.018-0.011,0.022c-0.009,0.003-0.02,0.006-0.029,0.001c-0.007-0.005-0.011-0.015-0.014-0.023
+  c-0.001-0.002-0.002-0.004-0.003-0.005c-0.013-0.002-0.022-0.011-0.03-0.021c-0.011-0.013-0.027-0.035-0.031-0.051
+  c-0.002-0.005,0-0.01-0.003-0.014c-0.001-0.003-0.006-0.005-0.008-0.008c-0.005-0.006-0.005-0.014-0.007-0.021
+  c-0.007-0.019-0.005-0.04-0.01-0.059c-0.003-0.016-0.01-0.029-0.012-0.044c-0.003-0.021,0.005-0.039,0.006-0.06
+  c0-0.009-0.004-0.022-0.009-0.033c-0.02-0.01-0.041-0.018-0.062-0.021c-0.024-0.003-0.037-0.011-0.053,0.012
+  c-0.006,0.008-0.007,0.018-0.014,0.026c-0.006,0.006-0.014,0.011-0.02,0.017c-0.009,0.008-0.013,0.018-0.021,0.028
+  c-0.005,0.007-0.012,0.014-0.016,0.021c-0.006,0.012-0.006,0.024-0.007,0.037c0,0.011-0.003,0.021-0.005,0.032
+  c-0.002,0.019-0.01,0.034-0.011,0.053c-0.001,0.018-0.001,0.039-0.005,0.057c-0.006,0.026-0.028,0.05-0.041,0.073
+  c-0.008,0.014-0.014,0.033-0.03,0.041c-0.003,0.001-0.009,0.002-0.012,0.004c-0.001,0-0.002,0.001-0.003,0.001
+  c-0.175,0.457-0.35,0.913-0.525,1.37c0,0.001,0.001,0,0.001,0.002c0.002,0.013-0.004,0.021-0.006,0.032
+  c-0.002,0.011,0.003,0.023,0.001,0.033c-0.003,0.012-0.015,0.025-0.022,0.034c-0.007,0.007-0.013,0.013-0.02,0.02
+  c-0.047,0.122-0.094,0.245-0.141,0.367c0.116,0.027,0.232,0.055,0.348,0.082c0.005-0.004,0.01-0.008,0.015-0.012
+  c0.01-0.006,0.022-0.01,0.032-0.016c0.007-0.005,0.012-0.011,0.017-0.017c0.004-0.003,0.006-0.005,0.008-0.006
+  c0.001-0.002,0.002-0.004,0.003-0.006c0.006-0.009,0.012-0.014,0.02-0.022c0.012-0.013,0.027-0.024,0.04-0.036
+  c0.012-0.011,0.022-0.022,0.033-0.033c0.012-0.012,0.026-0.021,0.038-0.033c0.01-0.01,0.025-0.02,0.037-0.028
+  c0.007-0.005,0.013-0.009,0.017-0.016c0.001-0.001,0.001-0.001,0.002-0.002c0.008-0.012,0.017-0.023,0.025-0.035
+  c0.002-0.004,0.004-0.008,0.006-0.012c0.001-0.004,0.006-0.005,0.008-0.008c0.048-0.065,0.095-0.131,0.142-0.196
+  c0.009-0.017,0.022-0.036,0.027-0.053c0.004-0.012,0.004-0.021,0.012-0.032c0.009-0.011,0.021-0.022,0.032-0.033
+  c0.014-0.014,0.027-0.028,0.037-0.045c0.004-0.006,0.01-0.012,0.014-0.018c0.007-0.011,0.013-0.023,0.021-0.033
+  c0.004-0.007,0.016-0.03,0.027-0.029c0.003,0,0.001,0.004,0.002,0.005c0.131-0.182,0.262-0.363,0.393-0.544
+  c0.001-0.004-0.001-0.009,0.001-0.012c0.005-0.011,0.014-0.017,0.023-0.027c0.002-0.003,0.006-0.009,0.009-0.011
+  c0.001-0.001,0.003-0.001,0.004-0.002c0.019-0.026,0.038-0.053,0.057-0.079c0.002-0.005,0.006-0.009,0.006-0.015
+  c0.001-0.005-0.001-0.011,0-0.017c0.001-0.006,0.005-0.01,0.006-0.016c0.001-0.005-0.001-0.011-0.001-0.017
+  c0.001-0.003,0.005-0.01,0.005-0.011c0-0.008-0.001-0.008-0.003-0.016c-0.005-0.017,0.001-0.031,0.009-0.046
+  c0.007-0.013,0.022-0.048,0.043-0.034c0.007,0.005,0.005,0.015,0.013,0.019c0.008,0.005,0.021,0.001,0.027-0.002
+  c0.007-0.004,0.012-0.01,0.018-0.015c0.026-0.036,0.053-0.073,0.079-0.109c-0.007-0.001-0.015-0.002-0.022-0.003
+  c-0.01-0.002-0.022,0-0.032,0c-0.02,0-0.056,0.005-0.05-0.027l0.007-0.003c-0.001,0-0.002-0.001-0.002-0.001
+  c-0.006-0.003-0.014-0.006-0.016-0.012c-0.002-0.007,0.004-0.016,0.006-0.022c0.004-0.01,0.004-0.018,0.007-0.028
+  c0.009-0.032,0.037-0.059,0.042-0.092c0.001-0.007-0.001-0.014,0.001-0.022c0.002-0.007,0.004-0.014,0.006-0.022
+  c0.003-0.015,0.01-0.035,0.019-0.049c0.009-0.014,0.021-0.027,0.034-0.038c0.012-0.009,0.027-0.02,0.028-0.037
+  c0.007-0.002,0.013,0.001,0.02-0.002c0.004-0.001,0.013-0.007,0.018-0.01c0.008-0.004,0.017-0.021,0.025-0.021
+  c0.002,0.01,0.005,0.018,0.007,0.028c0.002,0.016,0.007,0.033,0.01,0.049c0.001,0.011,0.003,0.026,0.001,0.037
+  c-0.001,0.006-0.005,0.01-0.006,0.016c-0.001,0.007,0.001,0.015,0,0.022c-0.002,0.021-0.009,0.046-0.018,0.065
+  c-0.009,0.022-0.014,0.048-0.02,0.071c-0.003,0.014-0.009,0.025-0.014,0.038c0.102-0.037,0.204-0.075,0.305-0.112
+  c0.052,0.073,0.104,0.145,0.156,0.218c-0.134,0.131-0.269,0.263-0.404,0.394c0.001,0.002,0,0.004,0,0.006
+  c0.004,0.023,0.023,0.036,0.023,0.06c-0.001,0.013,0.003,0.031,0,0.044c-0.003,0.009-0.01,0.018-0.013,0.028
+  c-0.003,0.014-0.01,0.028-0.013,0.042c-0.003,0.012-0.002,0.026-0.002,0.038c0,0.026,0,0.05-0.005,0.075
+  c-0.003,0.014-0.006,0.025-0.006,0.04c0.001,0.014-0.002,0.024-0.005,0.038c-0.003,0.012-0.005,0.025-0.009,0.037
+  c-0.004,0.011-0.01,0.022-0.012,0.033c-0.001,0.005,0,0.011-0.002,0.016c-0.003,0.007-0.012,0.015-0.017,0.022
+  c-0.006,0.011-0.012,0.022-0.019,0.033c-0.007,0.012-0.008,0.027-0.016,0.039c-0.006,0.009-0.011,0.017-0.016,0.027
+  c-0.006,0.011-0.01,0.021-0.014,0.032c-0.004,0.013-0.011,0.018-0.019,0.027c-0.009,0.012-0.018,0.023-0.028,0.033
+  c-0.012,0.012-0.024,0.019-0.033,0.033c-0.011,0.017-0.019,0.033-0.026,0.05c-0.002,0.005-0.006,0.01-0.007,0.015
+  c-0.001,0.005,0.002,0.01-0.001,0.015c-0.003,0.008-0.014,0.014-0.02,0.019c-0.016,0.012-0.039,0.021-0.051,0.037
+  c-0.007,0.009-0.014,0.017-0.02,0.027c-0.005,0.008-0.009,0.016-0.017,0.022c-0.007,0.005-0.018,0.007-0.027,0.009
+  c-0.006,0.002-0.01,0.001-0.016,0.002c-0.006,0-0.008,0.003-0.012,0.004c-0.023,0.005-0.046-0.007-0.06,0.016
+  c-0.01,0.015-0.021,0.031-0.03,0.046c-0.017,0.029-0.048,0.047-0.071,0.071c-0.017,0.019-0.027,0.039-0.05,0.052
+  c-0.005,0.003-0.008,0.002-0.013,0.005c-0.002,0.002-0.005,0.006-0.008,0.008c-0.006,0.007-0.012,0.012-0.016,0.021
+  c-0.014,0.027-0.025,0.057-0.035,0.086c-0.005,0.013-0.022,0.029-0.032,0.039c-0.01,0.011-0.021,0.019-0.028,0.033
+  c-0.005,0.009-0.008,0.019-0.014,0.028c-0.012,0.021-0.023,0.042-0.035,0.063c-0.011,0.018-0.016,0.042-0.026,0.061
+  c-0.009,0.019-0.022,0.037-0.033,0.054c-0.02,0.033-0.029,0.072-0.047,0.105c-0.011,0.02-0.021,0.036-0.035,0.053
+  c-0.017,0.02-0.014,0.044-0.028,0.064c-0.012,0.018-0.026,0.033-0.035,0.052c-0.009,0.018-0.014,0.035-0.025,0.052
+  c-0.011,0.019-0.03,0.032-0.041,0.051c-0.01,0.017-0.02,0.035-0.028,0.053c-0.009,0.021-0.024,0.036-0.037,0.055
+  c-0.005,0.008-0.011,0.013-0.016,0.021c-0.007,0.012-0.016,0.017-0.025,0.026c-0.009,0.01-0.015,0.021-0.027,0.028
+  c-0.007,0.004-0.013,0.005-0.019,0.013c-0.006,0.008-0.008,0.018-0.013,0.025c-0.005,0.006-0.012,0.011-0.016,0.017
+  c-0.009,0.01-0.016,0.022-0.026,0.029c-0.009,0.006-0.018,0.01-0.026,0.016c-0.02,0.016-0.025,0.002-0.041-0.011
+  c-0.01-0.007-0.022-0.013-0.033-0.019c-0.012-0.005-0.025-0.009-0.037-0.014c-0.01-0.005-0.015-0.011-0.027-0.011
+  c-0.013-0.001-0.024,0.002-0.036,0.005c-0.008,0.002-0.019,0.005-0.03,0.006c-0.017,0.01-0.028,0.021-0.043,0.033
+  c-0.005,0.003-0.01,0.007-0.016,0.009c-0.013,0.004-0.026,0.007-0.039,0.012c-0.008,0.004-0.018,0.006-0.027,0.011
+  c-0.008,0.004-0.015,0.01-0.022,0.015c-0.019,0.011-0.041,0.017-0.058,0.03c-0.015,0.011-0.028,0.021-0.044,0.03
+  c-0.016,0.008-0.033,0.014-0.05,0.022c-0.013,0.007-0.022,0.018-0.034,0.027c-0.005,0.004-0.006,0.001-0.011,0.006
+  c-0.003,0.003-0.006,0.009-0.009,0.013c-0.009,0.01-0.013,0.022-0.022,0.034c-0.017,0.024-0.036,0.05-0.058,0.068
+  c-0.018,0.014-0.028,0.031-0.038,0.05c-0.012,0.024-0.033,0.039-0.056,0.052c-0.019,0.01-0.042,0.025-0.053,0.045
+  c-0.007,0.01-0.018,0.023-0.022,0.034c-0.004,0.009-0.004,0.021-0.008,0.031c-0.008,0.022-0.027,0.034-0.044,0.047
+  c-0.021,0.018-0.039,0.04-0.057,0.062c-0.014,0.017-0.036,0.028-0.055,0.037c-0.004-0.008,0.01-0.019,0.014-0.026
+  c0.006-0.011,0.017-0.026,0.012-0.038c-0.009,0.002-0.019,0.011-0.027,0.016c-0.01,0.006-0.016,0.007-0.027,0.011
+  c-0.014,0.003-0.027,0.017-0.036,0.028c-0.015,0.016-0.027,0.027-0.045,0.038c-0.016,0.01-0.029,0.023-0.045,0.03
+  c-0.014,0.007-0.023,0.018-0.037,0.025c-0.018,0.008-0.032,0.021-0.049,0.03c-0.021,0.01-0.039,0.026-0.06,0.035
+  c-0.016,0.007-0.032,0.013-0.048,0.022c-0.017,0.01-0.032,0.02-0.05,0.03c-0.007,0.004-0.011,0.004-0.018,0.011
+  c-0.004,0.004-0.008,0.01-0.013,0.013c-0.01,0.008-0.022,0.016-0.033,0.022c-0.007,0.004-0.015,0.008-0.023,0.011
+  c-0.006,0.003-0.011,0.002-0.017,0.004c-0.003,0-0.005,0.002-0.006,0.004c-0.023,0.001-0.002-0.026,0.005-0.037
+  c0.005-0.007,0.011-0.012,0.013-0.021c0.001-0.009-0.004-0.019,0.001-0.027c0.002-0.005,0.01-0.008,0.013-0.013
+  c0.005-0.005,0.01-0.013,0.013-0.02c0.009-0.018,0.016-0.036,0.033-0.05c0.01-0.008,0.024-0.01,0.034-0.019
+  c0.007-0.008,0.011-0.019,0.02-0.025c0.007-0.006,0.016-0.008,0.023-0.013c0.008-0.007,0.012-0.021,0.014-0.029
+  c0.002-0.008-0.001-0.015,0.002-0.022c0.002-0.006,0.01-0.012,0.014-0.017c0.008-0.009,0.015-0.018,0.022-0.027
+  c0.016-0.019,0.03-0.037,0.04-0.059c0.01-0.02,0.021-0.037,0.033-0.055c0.007-0.009,0.014-0.018,0.021-0.027
+  c0.005-0.008,0.017-0.02,0.02-0.028c0.005-0.012,0.002-0.03,0.002-0.043c-0.001-0.019-0.005-0.024-0.022-0.028
+  c-0.013-0.004-0.017-0.008-0.026-0.017c-0.005-0.004-0.009-0.003-0.013-0.004c-0.344,0.335-0.687,0.671-1.031,1.006
+  c-0.061-0.042-0.122-0.085-0.183-0.128c-0.002,0.003-0.005,0.006-0.006,0.009c-0.013,0.031-0.044,0.08-0.08,0.087
+  c-0.008,0.002-0.009,0.001-0.017,0.006c-0.005,0.003-0.01,0.008-0.016,0.01c-0.009,0.002-0.025,0.003-0.033-0.003
+  c-0.003-0.003-0.005-0.006-0.005-0.01c-0.002,0.003-0.003,0.005-0.004,0.007c-0.007,0.014-0.02,0.029-0.023,0.045
+  c-0.004,0.02,0.003,0.034-0.007,0.053c-0.007,0.012-0.012,0.026-0.019,0.039c-0.004,0.008-0.005,0.013-0.007,0.022
+  c-0.002,0.01-0.004,0.012-0.011,0.02c-0.009,0.012-0.018,0.023-0.032,0.031c-0.015,0.008-0.036,0.005-0.049-0.002l0.003-0.007
+  c-0.002,0.001-0.005,0.002-0.008,0.001c-0.009-0.004-0.006-0.017-0.005-0.024c0.002-0.01,0.006-0.025,0.011-0.034
+  c0.006-0.011,0.016-0.017,0.022-0.027c0.002-0.004,0.007-0.01,0.008-0.014c0.003-0.008,0-0.017,0.003-0.026
+  c0.002-0.011,0.005-0.01,0-0.021c-0.004-0.01-0.01-0.018-0.014-0.027c-0.007-0.017,0.005-0.023,0.007-0.039
+  c0.001-0.01-0.001-0.012,0.005-0.022c0.005-0.007,0.009-0.012,0.013-0.02c0.005-0.014,0.007-0.026,0.025-0.029
+  c0.002,0,0.006,0,0.01,0c0-0.018,0.007-0.037,0.017-0.049c0.013-0.015,0.03-0.028,0.034-0.048c0.001-0.011-0.001-0.023-0.001-0.033
+  c0-0.005,0.002-0.009,0.003-0.014c-0.001-0.002-0.002-0.004-0.004-0.006c-0.344-0.241-0.689-0.482-1.033-0.722
+  c0.006-0.039,0.013-0.079,0.02-0.118c-0.014,0-0.028,0-0.041,0c-0.009,0-0.022,0.003-0.027-0.006
+  c-0.005-0.01,0.009-0.026,0.014-0.033c0.006-0.009,0.008-0.017,0.013-0.027c0.004-0.007,0.01-0.013,0.014-0.021
+  c0.006-0.01,0.01-0.02,0.014-0.031c0.002-0.005,0.004-0.006,0.004-0.012c0.001-0.008,0-0.014,0.001-0.021
+  c0.002-0.008,0.009-0.018,0.014-0.025c0.008-0.009,0.009-0.014,0.012-0.025c0.005-0.018,0.014-0.041,0.023-0.059
+  c0.001-0.001,0.003-0.002,0.004-0.003c0.012-0.068,0.023-0.137,0.035-0.205c-0.176-0.03-0.352-0.06-0.528-0.09
+  c0.067-0.179,0.135-0.359,0.203-0.538c-0.089-0.116-0.178-0.231-0.267-0.346c0.037-0.043,0.074-0.086,0.111-0.128
+  c-0.005-0.007-0.01-0.013-0.017-0.018c-0.204,0.031-0.408,0.062-0.612,0.094c-0.004-0.042,0.013,0.467-0.012-0.127
+  c-0.024-0.594,0.79-0.564,1.185-0.846c-0.005-0.014-0.01-0.028-0.014-0.042c-0.008-0.025-0.013-0.053-0.025-0.077
+  c-0.011-0.024-0.02-0.049-0.036-0.07c-0.014-0.017-0.036-0.032-0.039-0.054c-0.003-0.02,0.009-0.039,0.015-0.056
+  c0.008-0.018,0.028-0.026,0.045-0.035c0.009-0.005,0.019-0.007,0.027-0.014c0.009-0.008,0.01-0.015,0.015-0.026
+  c0.007-0.013,0.018-0.02,0.011-0.037c-0.001-0.003-0.006-0.008-0.008-0.012c-0.003-0.005-0.004-0.011-0.007-0.016
+  c-0.011-0.019-0.012-0.04-0.032-0.055c-0.02-0.014-0.04-0.028-0.06-0.042c-0.02-0.012-0.033-0.031-0.055-0.039
+  c-0.022-0.008-0.042-0.035-0.043-0.06c-0.001-0.011,0-0.022,0-0.033c0-0.014,0.003-0.024,0.005-0.038
+  c0.002-0.01-0.002-0.022,0.001-0.032c0.003-0.009,0.013-0.017,0.019-0.023c0.014-0.013,0.024-0.027,0.034-0.04
+  c-0.145-0.072-0.29-0.143-0.435-0.215c-0.005,0.005-0.011,0.01-0.012,0.016c-0.006-0.001-0.015-0.021-0.02-0.028
+  c-0.002-0.003-0.005-0.005-0.008-0.007c-0.101-0.05-0.203-0.101-0.304-0.151c-0.032-0.038-0.064-0.077-0.097-0.116
+  c-0.011-0.005-0.018-0.016-0.032-0.019c-0.013-0.003-0.019,0-0.029-0.01c-0.011-0.012-0.013-0.024-0.031-0.028
+  c-0.008-0.002-0.009,0.001-0.016-0.005c-0.006-0.004-0.013-0.012-0.018-0.017c-0.009-0.007-0.016-0.01-0.026-0.016
+  c-0.009-0.005-0.011-0.011-0.018-0.02c-0.003-0.005-0.006-0.008-0.01-0.011c-0.006-0.004-0.016-0.004-0.021-0.008
+  c-0.009-0.007-0.011-0.021-0.02-0.028c-0.007-0.004-0.014-0.005-0.019-0.013c-0.004-0.005-0.005-0.014-0.01-0.018
+  c-0.006-0.006-0.01-0.003-0.016-0.006c-0.014-0.006-0.011-0.023-0.02-0.033c-0.01-0.01-0.018-0.006-0.029-0.011
+  c-0.011-0.003-0.025-0.022-0.032-0.031c-0.015-0.022-0.04-0.033-0.055-0.055c-0.01-0.012-0.017-0.021-0.029-0.032
+  c-0.015-0.014-0.02-0.03-0.031-0.047c-0.007-0.01-0.017-0.018-0.021-0.03c-0.004-0.014,0.004-0.024,0.005-0.038
+  c0.001-0.025,0.01-0.045-0.002-0.069c-0.005-0.011,0.002-0.018,0.005-0.026c-0.059-0.071-0.118-0.142-0.177-0.214
+  c0.011-0.004,0.023-0.008,0.034-0.012l0.051-0.034c-0.007-0.015-0.015-0.032-0.006-0.049c0.007-0.011,0.017-0.026,0.025-0.037
+  c0.009-0.01,0.024-0.015,0.033-0.025c0.025-0.026,0.023-0.063,0.024-0.098c-0.252-0.022-0.504-0.045-0.755-0.067
+  c0.009-0.109,0.019-0.218,0.029-0.327c-0.002-0.001-0.004-0.003-0.006-0.005c-0.009-0.01-0.017-0.015-0.023-0.027
+  c-0.007-0.017-0.001-0.038,0.018-0.045c0.006-0.003,0.012,0.001,0.018,0.002c0.004-0.051,0.009-0.102,0.013-0.154
+  c-0.005-0.003-0.01-0.006-0.015-0.011c-0.009-0.01-0.015-0.019-0.027-0.027c-0.011-0.006-0.017-0.01-0.023-0.021
+  c-0.006-0.01-0.006-0.017-0.006-0.028c0-0.007-0.001-0.015,0-0.021c0.002-0.008,0.01-0.014,0.011-0.022
+  c0.001-0.009-0.009-0.02-0.016-0.026c-0.003-0.002-0.013-0.01-0.016-0.011c-0.005-0.002-0.012,0.001-0.016-0.002
+  c-0.021-0.015,0.031-0.046-0.012-0.054c-0.007-0.001-0.01,0.003-0.015-0.004c-0.002-0.003-0.004-0.018-0.005-0.021
+  c-0.003-0.015-0.001-0.031-0.001-0.046c0-0.016,0.002-0.034,0-0.049c-0.001-0.009-0.005-0.016-0.006-0.025
+  c-0.001-0.01,0-0.02,0-0.03c0-0.031,0.013-0.066,0.004-0.097c-0.006-0.025-0.003-0.05,0.003-0.076
+  c0.006-0.022,0.01-0.042,0.015-0.065c0.007-0.028,0.009-0.058,0.027-0.081c0.011-0.014,0.02-0.037,0.038-0.039
+  c0.017-0.001,0.018,0,0.026-0.016c0.008-0.015,0.007-0.027,0.007-0.044c0-0.022-0.001-0.044,0.004-0.065
+  c0.003-0.011,0.003-0.022,0.006-0.032c0.003-0.012,0.001-0.026,0.001-0.038c0-0.022-0.005-0.043-0.006-0.065
+  c0-0.013,0-0.026,0-0.039V49.35c0-0.013-0.001-0.028,0.002-0.041c0.001-0.005,0.003-0.007,0.004-0.013c0.001-0.005,0-0.011,0-0.017
+  c0-0.01-0.001-0.021,0-0.032c0-0.012,0.006-0.024,0.009-0.034c0.004-0.01,0.007-0.022,0.014-0.03
+  c0.007-0.009,0.015-0.007,0.026-0.007c0.009,0,0.024-0.001,0.031-0.007c0.012-0.009,0.006-0.019,0.003-0.031
+  c-0.003-0.011,0-0.022-0.001-0.033c-0.001-0.012-0.003-0.013,0.01-0.02c0.022-0.011,0.042-0.019,0.066-0.024
+  c0.012-0.002,0.022,0.002,0.032,0.005c0.011,0.003,0.022,0.001,0.033,0.001c0.011,0,0.022-0.001,0.033,0
+  c0.012,0.002,0.019,0.006,0.032,0.006c0.011,0,0.022,0,0.033,0c0.01-0.001,0.018,0.002,0.027,0.004
+  c0.007-0.002,0.014-0.004,0.022-0.005c0.012,0,0.026-0.001,0.038,0c0.011,0.002,0.016,0.006,0.027,0.006c0.011,0,0.022,0,0.033,0
+  c0.01,0,0.023,0.002,0.032,0c0.007-0.001,0.011-0.005,0.017-0.006c0.007-0.001,0.015,0.001,0.022,0.001
+  c0.019,0,0.046-0.005,0.065-0.001c0.005,0.001,0.006,0.005,0.01,0.006c0.007,0.002,0.018,0.002,0.026,0.004
+  c0.015,0.004,0.022,0.012,0.035,0.022c0.016,0.013,0.027,0.036,0.043,0.046c0.008,0.006,0.018,0.009,0.027,0.014
+  c0.014,0.007,0.024,0.01,0.038,0.013c0.008,0.002,0.008,0.006,0.016,0.003c0.002,0,0.01-0.008,0.012-0.009
+  c0.007-0.006,0.014-0.011,0.02-0.018c0.006-0.006,0.011-0.011,0.018-0.015c0.01-0.007,0.02-0.005,0.032-0.007
+  c0.009-0.001,0.019-0.007,0.028-0.008c0.007-0.001,0.014,0,0.02-0.001c0.012-0.002,0.022-0.009,0.034-0.006
+  c0.025,0.005,0.044,0.035,0.065,0.048c0.011,0.006,0.022,0.013,0.033,0.018c0.01,0.004,0.02,0.005,0.029,0.009
+  c0.009,0.004,0.016,0.008,0.024,0.014c0.015,0.01,0.032,0.011,0.049,0.016c0.023,0.006,0.055,0.022,0.071,0.038
+  c0.004,0.004,0.012,0.015,0.013,0.02c0,0.006-0.005,0.012-0.006,0.017c-0.002,0.007-0.005,0.014-0.006,0.021
+  c-0.004,0.019,0.02,0.048,0.033,0.059c0.013,0.012,0.028,0.026,0.043,0.034c0.002,0.001,0.01,0.003,0.013,0.004
+  c0.004,0.002,0.007,0.004,0.01,0.005c0.012,0.006,0.018,0.009,0.016,0.024c-0.003,0.013-0.009,0.014-0.017,0.021
+  c-0.007,0.007-0.012,0.017-0.016,0.028c-0.014,0.038-0.022,0.074-0.022,0.115c0,0.014,0.003,0.034,0,0.048
+  c-0.001,0.004-0.002,0.008-0.003,0.012c0.022,0.011,0.043,0.022,0.065,0.033c0.094-0.079,0.189-0.158,0.283-0.238
+  c-0.269-0.352-0.538-0.704-0.807-1.056c-0.004,0.003-0.008,0.006-0.014,0.006c-0.005,0.001-0.007,0.002-0.012,0.003
+  c-0.004,0.001-0.01,0.001-0.014,0c-0.022-0.005-0.047-0.009-0.067-0.019c-0.027-0.013-0.052-0.029-0.075-0.047
+  c-0.025-0.02-0.045-0.05-0.05-0.081c-0.003-0.019,0.003-0.037-0.006-0.054c-0.007-0.012-0.014-0.022-0.019-0.035
+  c-0.006-0.017,0.002-0.037,0.01-0.052c0.004-0.008,0.009-0.016,0.009-0.026c-0.001-0.004-0.002-0.007-0.002-0.011
+  c-0.062-0.08-0.124-0.161-0.186-0.242c0.389-1.261,1.079-1.084,1.742-0.555c0.001,0,0.002,0.001,0.003,0.001
+  c0.005,0,0.012-0.002,0.017-0.001c0.005,0.002,0.006,0.006,0.011,0.007c0.01,0.002,0.024,0,0.035,0s0.024-0.002,0.034-0.001
+  c0.013,0.002,0.021,0.006,0.035,0.006s0.027,0.001,0.041,0.006c0.009,0.003,0.019,0.01,0.028,0.012
+  c0.015,0.003,0.021-0.007,0.023,0.011c0.002,0.013,0.001,0.028-0.004,0.041c-0.008,0.019-0.013,0.035-0.013,0.057
+  c0,0.012-0.004,0.018-0.006,0.029c0,0.001,0,0.002,0,0.004c0.057,0.051,0.114,0.106,0.17,0.161c0.032,0.011,0.064,0.026,0.1,0.018
+  c0.005-0.001,0.005-0.005,0.012-0.005c0.007,0.001,0.013,0.005,0.018,0.008c0.012,0.006,0.015,0.01,0.029,0.01
+  c0.011,0,0.023,0,0.034,0c0.006,0,0.012-0.001,0.018,0c0.008,0.001,0.01,0.004,0.017,0.006c0.012,0.004,0.022,0.007,0.035,0.013
+  c0.01,0.005,0.019,0.01,0.028,0.016c0.02,0.011,0.043,0.018,0.064,0.028c0.035,0.018,0.058,0.054,0.086,0.08
+  c0.003,0.002,0.008,0.007,0.01,0.008c0.003,0.002,0.01,0.004,0.012,0.006c0.007,0.006,0.013,0.021,0.018,0.029
+  c0.005,0.01,0.008,0.019,0.007,0.031c-0.002,0.02-0.011,0.047-0.019,0.065c-0.004,0.008-0.013,0.015-0.018,0.022
+  c-0.004,0.007-0.007,0.016-0.011,0.023c-0.005,0.008-0.012,0.015-0.018,0.023c-0.005,0.008-0.009,0.018-0.014,0.026
+  c-0.002,0.004-0.005,0.007-0.007,0.01c0.042,0.045,0.084,0.091,0.124,0.136c0.006-0.006,0.013-0.013,0.02-0.016
+  c0.008-0.004,0.026-0.013,0.035-0.011c0.007,0.002,0.013,0.012,0.019,0.017c0.013,0.013,0.025,0.025,0.034,0.041
+  c0.008,0.013,0.01,0.027,0.018,0.04c0.004,0.007,0.007,0.015,0.011,0.024c0.012,0.026,0.032,0.046,0.049,0.069
+  c0.014,0.018,0.011,0.04,0.016,0.061c0.295,0.327,0.516,0.558,0.595,0.478c0.083-0.331,0.166-0.663,0.248-0.995
+  c0.021-0.028,0.042-0.057,0.063-0.085c-0.002-0.004-0.004-0.008-0.004-0.012c-0.001-0.012-0.002-0.029,0.001-0.041
+  c0.002-0.007,0.007-0.014,0.009-0.022c0.004-0.012,0.006-0.013,0.013-0.024c0.013-0.017,0.023-0.034,0.039-0.05
+  c0.015-0.016,0.035-0.03,0.057-0.04c0.002-0.005,0-0.01,0.002-0.02c0.001-0.006,0.005-0.01,0.006-0.017
+  c0.001-0.005-0.002-0.012,0-0.017c0.006-0.02,0.037-0.028,0.052-0.039c0.01-0.007,0.018-0.016,0.029-0.023
+  c0.01-0.007,0.02-0.012,0.031-0.018c0.038-0.053,0.077-0.106,0.116-0.159c0.014-0.002,0.029-0.003,0.044-0.004
+  c0.003-0.008,0.004-0.017,0.009-0.024c0.005-0.008,0.014-0.013,0.02-0.02c0.018-0.019,0.024-0.044,0.041-0.064
+  c0.005-0.006,0.013-0.011,0.017-0.018c0.006-0.01,0.008-0.024,0.011-0.035c0.003-0.009,0.009-0.019,0.011-0.028
+  c0.003-0.013-0.003-0.028,0.001-0.041c0.006-0.022,0.032-0.043,0.055-0.039c0.005,0.001,0.018,0.009,0.024,0.012
+  c0.012,0.005,0.024,0.01,0.035,0.017c0.038,0.023,0.05,0.063,0.071,0.101c0.009,0.018,0.023,0.034,0.031,0.053
+  c0.009,0.019,0.015,0.035,0.031,0.051c0,0,0,0.001,0.001,0.001c0.067-0.006,0.133-0.012,0.2-0.018c0-0.006,0.001-0.011,0.001-0.016
+  c-0.001-0.007-0.005-0.011-0.007-0.018c-0.001-0.005,0-0.013-0.001-0.018c-0.003-0.016-0.01-0.03-0.016-0.045
+  c-0.009-0.026-0.027-0.049-0.036-0.075c-0.009-0.026-0.021-0.058-0.016-0.087c0.004-0.018,0.009-0.014,0.023-0.017
+  c0.015-0.002,0.026-0.006,0.041-0.006c0.011,0,0.024,0.002,0.034,0.001c0.006-0.001,0.012-0.005,0.017-0.006
+  c0.014-0.005,0.022-0.004,0.036-0.002c0.014,0.002,0.029,0.002,0.044,0.002c0.016-0.001,0.028,0.003,0.043,0.006
+  c0.012,0.001,0.027-0.001,0.039-0.001c0.015,0,0.026,0.006,0.041,0.006c0.023,0,0.046-0.001,0.069,0.005
+  c0.012,0.003,0.024,0.006,0.036,0.007c0.018,0.001,0.034,0.009,0.052,0.012c0.022,0.002,0.048,0,0.067-0.007
+  c0.01-0.003,0.015-0.003,0.022-0.012c0.003-0.005,0.005-0.009,0.005-0.013c-0.02-0.016-0.041-0.03-0.057-0.05
+  c-0.016-0.022-0.029-0.044-0.04-0.069c-0.003-0.008-0.003-0.015-0.006-0.023c-0.001-0.005-0.004-0.009-0.006-0.015
+  c-0.002-0.01-0.004-0.02-0.004-0.031c0-0.019,0.003-0.043-0.003-0.06c-0.007-0.019-0.018-0.027-0.036-0.016
+  c-0.007,0.005-0.009,0.005-0.018,0.005c-0.008,0-0.015-0.001-0.023-0.004c-0.01-0.004-0.013-0.017-0.018-0.026
+  c-0.005-0.009-0.01-0.019-0.016-0.027c-0.011-0.014-0.031-0.005-0.044-0.015c-0.013-0.011-0.018-0.03-0.026-0.045
+  c-0.004-0.007-0.009-0.016-0.013-0.023c-0.003-0.004-0.008-0.007-0.011-0.011c-0.004-0.005-0.005-0.01-0.008-0.015
+  c-0.002-0.003-0.004-0.005-0.006-0.007c-0.009-0.003-0.018-0.008-0.028-0.013c-0.029-0.016-0.059-0.038-0.082-0.062
+  c-0.013-0.014-0.029-0.025-0.042-0.039c-0.008-0.008-0.016-0.018-0.023-0.027c-0.012-0.016-0.02-0.035-0.03-0.052
+  c-0.005-0.008-0.014-0.015-0.019-0.024c-0.004-0.007-0.007-0.012-0.011-0.019c-0.008-0.011-0.016-0.024-0.02-0.037
+  c-0.004-0.012-0.011-0.025-0.011-0.038c0-0.007,0-0.012,0.008-0.015c0.009-0.003,0.025,0.011,0.031,0.018
+  c0.006,0.007,0.008,0.017,0.014,0.024s0.013,0.012,0.018,0.02c0.005,0.007,0.008,0.012,0.016,0.017
+  c0.006,0.003,0.013,0.004,0.018,0.009c0.007,0.006,0.015,0.016,0.02,0.023c0.005,0.007,0.009,0.015,0.016,0.007
+  c0.005-0.005,0.006-0.015,0.011-0.019c0.004-0.004,0.013-0.009,0.019-0.008c0.006,0,0.01,0.008,0.015,0.011
+  c0.004,0.001,0.019,0.002,0.022,0.001c0.011-0.005-0.01-0.025-0.014-0.032c-0.008-0.015-0.014-0.032-0.021-0.048
+  c-0.005-0.014-0.005-0.029-0.01-0.041c-0.006-0.017-0.008-0.034-0.016-0.049c-0.004-0.008-0.007-0.016-0.012-0.023
+  c-0.004-0.008-0.011-0.013-0.017-0.019c-0.009-0.009-0.018-0.018-0.027-0.027c-0.009-0.008-0.02-0.014-0.03-0.022
+  c-0.014-0.011-0.025-0.024-0.038-0.035c-0.004-0.004-0.008-0.006-0.011-0.011c-0.002-0.001-0.004-0.005-0.005-0.007
+  c-0.004-0.007-0.007-0.011-0.013-0.016c-0.003-0.003-0.012-0.009-0.008-0.014c0.002-0.003,0.016,0.004,0.021,0.003
+  c-0.005-0.004-0.012-0.007-0.017-0.011c-0.008-0.006-0.014-0.013-0.021-0.02c-0.006-0.006-0.014-0.012-0.021-0.019
+  c-0.003-0.003-0.004-0.006-0.008-0.009c-0.003-0.002-0.005-0.003-0.008-0.004c-0.004-0.003-0.008-0.009-0.011-0.013
+  c-0.005-0.006-0.008-0.012-0.012-0.019c-0.008-0.013-0.017-0.027-0.03-0.036c-0.013-0.01-0.026-0.02-0.035-0.035
+  c-0.006-0.012-0.009-0.026-0.014-0.038c-0.007-0.014-0.027-0.015-0.038-0.025c-0.008-0.008-0.013-0.02-0.022-0.028
+  c-0.017-0.015-0.038-0.031-0.06-0.037c-0.009-0.003-0.013-0.003-0.019-0.012c-0.003-0.005-0.004-0.015-0.012-0.018
+  c-0.012-0.005-0.023,0.017-0.034,0c-0.003-0.006-0.004-0.014-0.007-0.02c-0.003-0.004-0.008-0.01-0.012-0.014
+  c-0.011-0.009-0.025-0.017-0.037-0.023c-0.021-0.011-0.047-0.007-0.067-0.016c-0.014-0.006-0.033-0.01-0.047-0.015
+  c-0.014-0.004-0.02-0.01-0.031-0.021c-0.01-0.011-0.025-0.019-0.034-0.031c-0.01-0.015-0.017-0.028-0.033-0.038
+  c-0.015-0.01-0.031-0.02-0.046-0.03c-0.004-0.002-0.005,0-0.008-0.004c-0.003-0.003-0.003-0.008-0.006-0.012
+  c-0.004-0.007-0.011-0.012-0.019-0.015c-0.011-0.003-0.02-0.009-0.027-0.018c-0.004-0.008-0.01-0.012-0.015-0.019
+  c-0.01-0.015-0.016-0.031-0.026-0.046c-0.009-0.012-0.018-0.022-0.028-0.033c-0.005-0.005-0.011-0.009-0.018-0.011
+  c-0.008-0.004-0.016-0.008-0.024-0.012c-0.01-0.005-0.021-0.008-0.032-0.016c-0.008-0.006-0.015-0.012-0.023-0.018
+  c-0.015-0.01-0.029-0.021-0.041-0.034c-0.009-0.01-0.015-0.017-0.027-0.023c-0.007-0.003-0.015-0.003-0.023-0.005
+  c-0.011-0.002-0.021-0.006-0.031-0.01c-0.01,0.004-0.02,0.008-0.031,0.009c-0.01,0.002-0.015,0.001-0.024,0.008
+  c-0.01,0.008-0.019,0.022-0.022,0.035c-0.004,0.019,0.006,0.031,0.012,0.048c0.013,0.034,0.016,0.069-0.027,0.074
+  c0,0.01-0.009,0.017-0.011,0.025c-0.002,0.01,0.001,0.022,0,0.032c-0.001,0.022-0.028,0.033-0.047,0.037
+  c-0.007,0.002-0.016,0.001-0.023,0c-0.007,0-0.011-0.003-0.016-0.004c-0.004-0.001-0.01,0-0.014-0.001
+  c-0.005-0.001-0.006-0.005-0.01-0.006c-0.005-0.001-0.01,0.001-0.015-0.001c-0.002,0-0.008-0.004-0.011-0.005
+  c-0.009-0.004-0.017-0.01-0.026-0.016c-0.009-0.005-0.018-0.011-0.028-0.016c-0.005-0.002-0.009-0.005-0.014-0.009
+  c-0.003-0.002-0.008-0.004-0.011-0.006c-0.016-0.012-0.025-0.032-0.036-0.048c-0.018-0.024-0.04-0.013-0.065-0.009
+  c-0.005,0.001-0.01-0.001-0.016,0c-0.005,0.001-0.009,0.004-0.015,0.006c-0.008,0.001-0.017-0.002-0.025-0.001
+  c-0.01,0.001-0.018,0.005-0.027,0.006c-0.018,0.001-0.036-0.003-0.053,0.001c-0.017,0.003-0.033,0.007-0.05,0.009
+  c-0.006,0.001-0.012,0-0.018,0.001c-0.004,0.001-0.006,0.004-0.012,0.005c-0.005,0-0.011-0.002-0.016-0.001
+  c-0.005,0.001-0.005,0.005-0.01,0.006c-0.007,0.001-0.014-0.002-0.021-0.001c-0.006,0.002-0.01,0.005-0.016,0.006
+  c-0.011,0.002-0.02,0.003-0.032,0.006c-0.012,0.004-0.018,0.004-0.031,0.003c-0.019-0.001-0.032,0.006-0.048,0.016
+  c-0.022,0.014-0.04,0.037-0.068,0.038c-0.011,0-0.016-0.004-0.026-0.005c-0.012-0.002-0.021,0-0.032,0.004
+  c-0.014,0.004-0.028,0.007-0.042,0.01c-0.012,0.003-0.025,0.006-0.037,0.007c-0.028,0.002-0.055,0.009-0.082,0.016
+  c-0.022,0.005-0.044,0.01-0.065,0.014c-0.015,0.003-0.029,0.009-0.043,0.012c-0.024,0.005-0.054,0-0.078,0
+  c-0.021,0-0.04,0-0.054-0.015c-0.01-0.009-0.02-0.026-0.024-0.039c-0.002-0.006-0.002-0.01-0.005-0.016
+  c-0.002-0.003-0.006-0.006-0.008-0.009c-0.007-0.009-0.011-0.021-0.016-0.032c-0.011-0.022-0.012-0.039,0.007-0.058
+  c0.009-0.009,0.017-0.014,0.022-0.026c0.004-0.008,0.006-0.017,0.01-0.025c0.009-0.017,0.018-0.033,0.03-0.05
+  c0.019-0.03-0.027-0.017-0.041-0.014c-0.021,0.004-0.037-0.007-0.046-0.023c-0.009-0.015-0.019-0.029-0.032-0.042
+  c-0.007-0.007-0.014-0.01-0.021-0.016c-0.007-0.005-0.011-0.013-0.018-0.018c-0.019-0.013-0.038-0.025-0.057-0.038
+  c-0.01-0.007-0.016-0.016-0.025-0.023c-0.008-0.006-0.016-0.012-0.024-0.018c-0.013-0.01-0.024-0.021-0.036-0.033
+  c-0.017-0.015-0.036-0.023-0.056-0.033c-0.018-0.009-0.035-0.024-0.054-0.03c-0.024-0.008-0.047-0.018-0.068-0.033
+  c-0.005-0.003-0.01-0.006-0.015-0.01c-0.009,0.006-0.018,0.012-0.026,0.017c-0.013,0.007-0.019,0.007-0.033,0.01
+  c-0.012,0.002-0.019,0.005-0.031,0.005c-0.018,0-0.036,0.002-0.053,0.001c-0.021-0.002-0.038-0.008-0.059-0.005
+  c-0.024,0.004-0.049,0.009-0.073,0.01c-0.023,0-0.046,0-0.068,0c-0.013,0-0.025-0.002-0.038-0.001
+  c-0.014,0.001-0.026,0.006-0.04,0.006c-0.029,0-0.057-0.015-0.086-0.016c-0.01,0-0.021,0-0.031,0c-0.017,0-0.03,0.004-0.046,0.005
+  c-0.02,0.002-0.04,0.009-0.06,0.011c-0.011,0.002-0.024,0-0.036,0h-0.069c-0.01,0-0.021,0-0.031,0c-0.011,0-0.016-0.004-0.027-0.006
+  c-0.012-0.001-0.014,0.001-0.021-0.01c-0.006-0.011-0.003-0.02-0.014-0.028c-0.012-0.009-0.029-0.013-0.043-0.018
+  c-0.019-0.007-0.039-0.012-0.058-0.018c-0.007-0.003-0.015-0.007-0.021-0.008c-0.009-0.003-0.018,0-0.027-0.001
+  c-0.009-0.002-0.017-0.005-0.026-0.006c-0.012-0.001-0.025-0.003-0.036-0.006c-0.014-0.004-0.029-0.009-0.043-0.01
+  c-0.007,0-0.015,0.002-0.021,0.001c-0.014-0.003-0.027-0.011-0.042-0.011c-0.007-0.001-0.014,0.001-0.022,0
+  c-0.008-0.001-0.012-0.004-0.02-0.006c-0.017-0.002-0.032-0.002-0.048-0.009c-0.018-0.007-0.033-0.016-0.053-0.017
+  c-0.021-0.002-0.046,0.005-0.067,0c-0.007-0.001-0.014-0.004-0.021-0.006c-0.005-0.002-0.011-0.003-0.017-0.005
+  c-0.006-0.002-0.01-0.007-0.015-0.01c-0.007-0.003-0.014-0.007-0.021-0.01c-0.026-0.013-0.051-0.024-0.075-0.041
+  c-0.011-0.008-0.021-0.019-0.031-0.029c-0.006-0.006-0.028-0.023-0.016-0.03l0.011-0.011c-0.01-0.002-0.023-0.029-0.017-0.036
+  c0.004-0.004,0.022-0.006,0.027-0.006c0.009-0.001,0.018,0,0.027,0c0.016,0,0.036,0.003,0.052,0
+  c0.008-0.001,0.016-0.008,0.022-0.009c0.009-0.003,0.017-0.001,0.025-0.001c0.022-0.001,0.038-0.017,0.059-0.016
+  c0.022,0,0.032-0.006,0.046-0.023c0.006-0.007,0.011-0.016,0.015-0.025c0.004-0.007,0.011-0.014,0.013-0.021
+  c0.002-0.008-0.002-0.018-0.001-0.026c0.002-0.01,0.006-0.016,0.005-0.026c0-0.004,0-0.008,0.001-0.011
+  c-0.001-0.005-0.004-0.008-0.005-0.012c-0.002-0.01,0-0.016-0.006-0.026c-0.006-0.012-0.014-0.023-0.02-0.036
+  c-0.003-0.008-0.006-0.014-0.01-0.021c-0.009-0.013-0.016-0.027-0.024-0.041c-0.006-0.011-0.017-0.025-0.02-0.038
+  c-0.008-0.032,0.022-0.019,0.041-0.015c0.009,0.001,0.018,0.004,0.028,0.005c0.003,0,0.007,0,0.01,0
+  c0.006,0,0.008,0.003,0.012,0.004c0.032,0.008,0.064,0.018,0.093,0.032c0.006-0.022-0.001-0.041-0.019-0.054
+  c-0.009-0.006-0.019-0.01-0.028-0.015c-0.011-0.007-0.019-0.017-0.026-0.027c-0.014-0.021-0.021-0.047-0.021-0.072
+  c0-0.012-0.004-0.02-0.006-0.031c-0.002-0.014,0.006-0.025,0.006-0.038c-0.001-0.015-0.009-0.033-0.006-0.047
+  c0.002-0.009,0.01-0.016,0.011-0.026c0.001-0.005,0-0.011,0-0.016c0-0.007,0.003-0.009,0.004-0.016c0.001-0.003,0-0.013,0.002-0.015
+  c0.004-0.003,0.015,0,0.02,0c0.015-0.002,0.011-0.008,0.011-0.022V43.87c0-0.023-0.001-0.043,0.026-0.042
+  c0.012,0,0.02,0.001,0.032,0.004c0.011,0.003,0.025,0.001,0.037,0.001s0.024-0.001,0.037,0c0.015,0.001,0.028,0.007,0.043,0.011
+  c0.023,0.006,0.05,0.011,0.071,0.022c0.007,0.004,0.02,0.005,0.023,0.014c0.004,0.013-0.004,0.027-0.006,0.038
+  c-0.002,0.012,0.002,0.024-0.001,0.036c-0.003,0.01-0.004,0.019-0.008,0.028c-0.009,0.019-0.021,0.038-0.002,0.057
+  c0.01,0.009,0.025,0.01,0.036,0.016c0.011,0.006,0.022,0.009,0.033,0.014c0.008,0.003,0.015,0.006,0.021,0.011
+  c0.004,0.003,0.007,0.005,0.011,0.01s0.007,0.011,0.011,0.016c0.011,0.012,0.044,0.036,0.059,0.017
+  c0.01-0.013-0.027-0.049-0.038-0.058c-0.008-0.006-0.014-0.015-0.022-0.02c-0.006-0.005-0.009-0.006-0.015-0.012
+  c-0.006-0.008-0.011-0.015-0.011-0.026c0-0.012,0.006-0.017,0.012-0.026c0.002-0.004,0.007-0.012,0.008-0.016
+  c0.001-0.005,0.004-0.013,0.005-0.017c0.005-0.027-0.005-0.037-0.02-0.057c-0.008-0.01-0.013-0.021-0.021-0.031
+  c-0.005-0.008-0.01-0.012-0.015-0.021c-0.004-0.007-0.006-0.015-0.011-0.022c-0.008-0.01-0.014-0.023-0.022-0.033
+  c-0.01-0.011-0.024-0.021-0.037-0.03c-0.024-0.015-0.04-0.036-0.059-0.056c-0.012-0.015-0.021-0.031-0.034-0.045
+  c-0.007-0.008-0.015-0.019-0.012-0.031c0.003-0.014,0.024-0.024,0.037-0.026c0.008-0.001,0.015,0.001,0.023,0
+  c0.007-0.001,0.013-0.004,0.02-0.005c0.013-0.003,0.028,0.002,0.041,0.004c0.01,0.002,0.022,0,0.032,0.002
+  c0.013,0.004,0.023,0.003,0.037,0.004c0.024,0.002,0.033,0.015,0.049,0.031c0.015,0.014,0.032,0.025,0.051,0.033
+  c0.022,0.008,0.041,0.001,0.063,0.005c0.009,0.001,0.02,0.008,0.028,0.009c0.011,0.003,0.023,0.001,0.036,0.001
+  c0.01,0.001,0.018,0.005,0.026,0.012c0.009,0.009,0.008,0.013,0.011,0.024c0.003,0.007,0.01,0.016,0.014,0.023
+  c0.006,0.01,0.006,0.02,0.013,0.031c0.009,0.015,0.021,0.028,0.03,0.042c0.006,0.009,0.011,0.021,0.017,0.03
+  c0.009,0.013,0.022,0.022,0.032,0.033c0.014,0.016,0.03,0.03,0.046,0.042c0.019,0.013,0.041,0.018,0.058,0.032
+  c0.012,0.009,0.025,0.016,0.037,0.025c0.019,0.014,0.024,0.039,0.042,0.055c0.008,0.007,0.018,0.013,0.025,0.021
+  c0.006,0.008,0.014,0.018,0.023,0.024c0.014,0.009,0.027,0.003,0.042,0.006c0.009,0.002,0.02,0.009,0.03,0.012
+  c0.019,0.008,0.034,0.026,0.054,0.035c0.022,0.01,0.049,0.017,0.073,0.017c0.012-0.001,0.02,0.004,0.032,0.005
+  c0.017,0.001,0.032-0.005,0.049-0.006c0.01,0,0.025-0.001,0.035,0c0.012,0.002,0.019,0.006,0.032,0.006
+  c0.012,0,0.02,0.003,0.031,0.005c0.005,0.002,0.011-0.001,0.016,0c0.009,0.001,0.009,0.002,0.016,0.007
+  c0.007,0.004,0.014,0.01,0.021,0.014c0.008,0.005,0.017,0.007,0.026,0.011c0.011,0.004,0.021,0.003,0.032,0.006
+  c0.013,0.004,0.024,0.012,0.032,0.021c0.003-0.001,0.007-0.003,0.01-0.005c0.024-0.012,0.043-0.023,0.054-0.049
+  c0.009-0.019,0.003-0.044-0.007-0.063c-0.009-0.018-0.038-0.035-0.036-0.058c0.003-0.021,0.03-0.027,0.031-0.047
+  c0.001-0.009,0.002-0.023,0-0.032s-0.011-0.023-0.015-0.031c-0.005-0.008-0.011-0.012-0.015-0.02
+  c-0.004-0.006-0.005-0.014-0.008-0.02c-0.005-0.01-0.009-0.019-0.013-0.029c-0.004-0.008-0.009-0.019-0.011-0.027
+  c-0.001-0.005,0-0.01-0.002-0.015c-0.003-0.006-0.011-0.01-0.016-0.014c-0.017-0.014-0.03-0.026-0.042-0.044
+  c-0.006-0.009-0.013-0.017-0.019-0.026c-0.007-0.011-0.016-0.015-0.028-0.021c-0.019-0.011-0.035-0.021-0.056-0.028
+  c-0.003-0.001-0.009-0.003-0.012-0.004c-0.001,0-0.011-0.004-0.012-0.004c-0.011-0.002-0.023-0.001-0.035-0.001
+  c-0.01,0-0.023,0.003-0.032,0c-0.011-0.002-0.013-0.016-0.016-0.026c-0.005-0.021-0.002-0.048-0.022-0.062
+  c-0.018-0.014-0.038-0.02-0.057-0.032c-0.017-0.01-0.03-0.028-0.047-0.039c-0.032-0.022-0.095-0.042-0.095-0.088
+  c0-0.008,0.003-0.014,0.004-0.022c0.002-0.006,0-0.013,0.001-0.019c0.002-0.011,0.007-0.022,0.01-0.033
+  c0.002-0.008,0.002-0.013,0.006-0.021s0.01-0.018,0.015-0.025c0.009-0.016,0.02-0.029,0.032-0.041
+  c-0.009-0.008-0.018-0.015-0.027-0.023c-0.015-0.014-0.039-0.026-0.058-0.034c-0.014-0.006-0.026-0.014-0.041-0.021
+  c-0.017-0.007-0.046-0.021-0.052-0.04c-0.003-0.008-0.005-0.019-0.006-0.027c0-0.012,0.003-0.021-0.004-0.031
+  c-0.006-0.008-0.016-0.014-0.021-0.023c-0.002-0.004-0.002-0.01-0.005-0.015c-0.002-0.004-0.005-0.005-0.007-0.009
+  c-0.004-0.015-0.002-0.044,0-0.059c0.003-0.016,0.011-0.03,0.011-0.047c0-0.021-0.001-0.036-0.009-0.054
+  c-0.009-0.018-0.015-0.038-0.023-0.056c-0.011-0.024-0.029-0.045-0.047-0.064c-0.03-0.032-0.062-0.064-0.088-0.1
+  c-0.012-0.016-0.026-0.032-0.037-0.048c-0.011-0.017-0.019-0.038-0.033-0.052c-0.006-0.006-0.014-0.007-0.02-0.011
+  c-0.006-0.005-0.013-0.014-0.018-0.02c-0.007-0.01-0.024-0.035-0.019-0.047c0.007,0.003,0.018,0.008,0.026,0.005
+  c0.011-0.005,0.003-0.014,0-0.021c-0.002-0.004-0.003-0.009-0.004-0.012c-0.002-0.005-0.005-0.011-0.008-0.015
+  c-0.006-0.01-0.013-0.023-0.021-0.031c-0.013-0.014-0.025-0.027-0.034-0.043c-0.003-0.004-0.013-0.015-0.013-0.021
+  c0.001-0.009,0.015-0.012,0.022-0.016c0.011-0.006,0.03-0.02,0.025-0.035c-0.002-0.006-0.011-0.016-0.016-0.021
+  c-0.008-0.008-0.023-0.008-0.029-0.018c-0.004-0.007-0.004-0.018-0.007-0.025c-0.004-0.012-0.005-0.02-0.005-0.032
+  c0-0.01-0.002-0.019,0.004-0.028s0.014-0.011,0.022-0.015c0.014-0.007,0.036-0.02,0.02-0.035c-0.012-0.012-0.031-0.015-0.046-0.022
+  c-0.019-0.009-0.042-0.015-0.063-0.021c-0.014-0.004-0.029-0.004-0.042-0.007c-0.013-0.002-0.027-0.01-0.038-0.013
+  c-0.019-0.005-0.04,0.001-0.058-0.005c-0.009-0.003-0.018-0.007-0.026-0.011c-0.013-0.005-0.023-0.005-0.036-0.007
+  c-0.012-0.003-0.025-0.008-0.037-0.011c-0.01-0.003-0.021-0.007-0.032-0.01c-0.01-0.002-0.02-0.005-0.031-0.005
+  c-0.013,0.001-0.024-0.004-0.037-0.005c-0.007,0-0.025-0.003-0.031-0.006c-0.011-0.008-0.006-0.014,0.005-0.015
+  c0.01-0.001,0.02,0.002,0.03-0.001c0.007-0.002,0.013-0.01,0.022-0.011c-0.001-0.005-0.019-0.015-0.025-0.018
+  c-0.011-0.007-0.02-0.007-0.032-0.007c-0.011,0-0.022,0-0.032,0c-0.005,0-0.011,0.001-0.016,0c-0.008,0-0.013-0.004-0.021-0.005
+  c-0.011-0.002-0.021-0.003-0.032-0.005c-0.005-0.002-0.009-0.004-0.015-0.006c-0.009-0.002-0.02,0-0.03-0.003
+  c-0.014-0.005-0.024-0.006-0.039-0.007c-0.013-0.001-0.023-0.006-0.037-0.005c-0.011,0-0.02-0.004-0.031-0.006
+  c-0.012-0.001-0.025-0.003-0.036-0.006c-0.009-0.003-0.017-0.008-0.027-0.009c-0.007-0.001-0.01-0.003-0.016-0.005
+  c-0.008-0.001-0.014,0-0.021-0.001c-0.011-0.001-0.016-0.005-0.027-0.005s-0.021,0.001-0.03-0.007c-0.01-0.008-0.006-0.013,0-0.023
+  c0.006-0.01,0.009-0.016,0.009-0.028c0-0.022,0.001-0.042-0.004-0.063c-0.001-0.006,0-0.01-0.001-0.016s-0.004-0.01-0.005-0.016
+  c-0.002-0.009,0.002-0.02,0.011-0.025c0.005-0.003,0.01,0,0.015-0.001c0.006-0.001,0.01-0.005,0.016-0.006
+  c0.011-0.002,0.02,0,0.031-0.005c0.011-0.004,0.023-0.006,0.033-0.011c0.012-0.006,0.032-0.01,0.041-0.019
+  c0.02-0.018-0.012-0.029-0.022-0.042c-0.019-0.022-0.022-0.037-0.016-0.065c0.002-0.01,0.009-0.02,0.006-0.031
+  c-0.003-0.007-0.007-0.014-0.011-0.021c-0.716-0.167-1.463-0.256-2.23-0.256c-1.483,0-2.888,0.331-4.147,0.923
+  c-0.001,0.002-0.003,0.003-0.004,0.004c-0.011,0.007-0.019,0.017-0.021,0.029c-0.001,0.003-0.001,0.007-0.001,0.011
+  c0.689-0.188,1.378-0.376,2.067-0.564c0.028,0.121,0.055,0.242,0.083,0.363c-0.41,0.599-0.395,1.249-1.229,1.798
+  c-0.743,0.488-0.665,0.181-0.862,0.139c0,0,0,0,0,0.001c0.002,0.009,0.006,0.021,0.003,0.031c-0.002,0.006-0.008,0.015-0.012,0.021
+  c-0.004,0.007-0.01,0.015-0.014,0.022c-0.003,0.006-0.006,0.009-0.01,0.014c-0.001,0.001-0.047,0.052-0.11,0.123
+  c-0.002,0.008-0.005,0.017-0.007,0.025c0.052-0.057,0.09-0.098,0.089-0.095c-0.008,0.019-0.015,0.038-0.025,0.057
+  c-0.011,0.021-0.027,0.038-0.044,0.055c-0.011,0.01-0.022,0.021-0.032,0.031c-0.161,0.768,0.008,1.628-0.821,2.21
+  c-0.58,0.408-0.637,0.248-0.658,0.049c-0.037,0.163-0.024,0.083-0.004-0.031c-0.01-0.112-0.018-0.228-0.106-0.255
+  c-0.007-0.017-0.014-0.034-0.021-0.051c-0.001,0-0.002,0-0.003,0c-0.004,0-0.007,0.003-0.011,0.004
+  c-0.006,0.001-0.012-0.001-0.018,0c-0.009,0.003-0.017,0.003-0.025,0.006c-0.008,0.002-0.014,0.005-0.022,0.009
+  c-0.017,0.008-0.028-0.011-0.028-0.026c0-0.007,0-0.015,0-0.022c0-0.009,0.002-0.011,0.007-0.018
+  c0.003-0.005,0.005-0.011,0.004-0.018c-0.001-0.003-0.004-0.003-0.004-0.006c-0.001-0.005,0.002-0.009-0.003-0.012
+  c0.004-0.006,0.006-0.014,0.009-0.021c0.004-0.007,0.005-0.019,0.011-0.025c-0.016,0.001-0.03,0.01-0.043,0.018
+  c-0.008,0.005-0.015,0.009-0.024,0.012c-0.01,0.002-0.018,0.007-0.028,0.01c-0.023,0.009-0.044,0.022-0.066,0.032
+  c-0.016,0.006-0.03,0.011-0.046,0.018c-0.018,0.01-0.036,0.019-0.053,0.029c-0.016,0.008-0.028,0.024-0.047,0.024
+  c-0.012,0-0.02-0.003-0.031-0.008c-0.01-0.004-0.019-0.006-0.028-0.013c0,0,0.001,0,0.002,0h0.007
+  c-0.006-0.001-0.014-0.007-0.018-0.011c-0.006-0.006-0.002-0.014,0.001-0.021c0.01-0.023,0.03-0.038,0.045-0.057
+  c0.005-0.006,0.009-0.013,0.014-0.019c0.005-0.008,0.012-0.011,0.018-0.018c0.004-0.004,0.008-0.008,0.012-0.013
+  c0.006-0.006,0.014-0.007,0.02-0.012c0.014-0.011,0.025-0.022,0.036-0.035c0.008-0.01,0.017-0.017,0.025-0.026
+  c0.005-0.007,0.013-0.011,0.018-0.017c0.003-0.005,0.007-0.01,0.009-0.014c0.002-0.005,0.001-0.008,0.003-0.012
+  c0-0.003,0.003-0.003,0.003-0.006c0.001-0.004-0.002-0.007,0.001-0.011c0,0,0.006-0.002,0.007-0.003
+  c0.005-0.003,0.012-0.008,0.016-0.012c0.008-0.009,0.014-0.021,0.019-0.032c0.003-0.006,0.004-0.013,0.006-0.018
+  c0.004-0.008,0.01-0.014,0.013-0.021c0.006-0.015,0.013-0.03,0.026-0.041c-0.101-0.249-0.203-0.497-0.304-0.746
+  c0,0-0.001,0-0.001-0.001c-0.014-0.013-0.029-0.014-0.046-0.004c-0.017,0.012-0.022-0.004-0.038-0.007
+  c-0.008-0.001-0.014,0-0.021,0.004c-0.002,0.002-0.004,0.004-0.006,0.005c-0.002,0.001-0.007,0.003-0.009,0.004
+  c-0.006,0.006-0.007,0.015-0.015,0.02c-0.009,0.006-0.01,0.002-0.017-0.002c-0.016-0.008-0.031,0.007-0.042,0.017
+  c-0.009,0.008-0.018,0.016-0.03,0.016c-0.01,0.001-0.012,0-0.019,0.005c-0.004,0.003-0.012,0.011-0.017,0.012
+  c-0.003,0-0.019-0.005-0.021-0.008c-0.008,0.003-0.016,0.007-0.024,0.01c-0.003,0.001-0.008,0.005-0.011,0.005
+  c-0.006,0.001-0.007-0.003-0.012-0.003c-0.005,0-0.014,0.008-0.019,0.01c-0.005,0.003-0.011,0.006-0.017,0.008
+  s-0.021,0.003-0.024,0.008c-0.001-0.01,0.005-0.015,0.009-0.023c0.005-0.009,0.007-0.019,0.012-0.028
+  c0.005-0.009,0.008-0.019,0.012-0.028c0.002-0.006,0.005-0.013,0.007-0.019c0.002-0.005,0.005-0.009,0.008-0.013
+  c0.001-0.004,0-0.008,0.001-0.012c0.003-0.011,0.011-0.02,0.014-0.031c0.003-0.01,0.007-0.019,0.009-0.028
+  c0.001-0.005,0.003-0.012,0.004-0.017c0.001-0.003,0.004-0.004,0.004-0.007c0.001-0.008-0.005-0.009-0.003-0.018
+  c0.001-0.006,0.008-0.012,0.007-0.018c-0.008-0.003-0.011,0.009-0.019,0.007c-0.003-0.008,0.006-0.022,0.008-0.03
+  c0.002-0.008,0.007-0.016,0.01-0.024c-0.011-0.005-0.014,0.007-0.023,0.007c-0.005,0.001-0.013-0.007-0.012-0.012
+  c0-0.003,0.004-0.006,0.005-0.008c0.005-0.008,0.014-0.015,0.018-0.024c0.004-0.009,0.006-0.019,0.01-0.028
+  c0.003-0.006,0.008-0.01,0.01-0.016c0.002-0.004,0.002-0.008,0.004-0.012c0.004-0.007,0.011-0.015,0.017-0.021
+  c0.012-0.011,0.026-0.024,0.04-0.034c0.01-0.008,0.017-0.012,0.021-0.025c0.003-0.009,0.004-0.019,0.007-0.028
+  c0.005-0.017,0.019-0.032,0.028-0.047c0-0.001,0.001-0.002,0.001-0.002c-0.01-0.024-0.019-0.048-0.029-0.071
+  c-0.012,0.003-0.024,0.007-0.036,0.009c-0.033,0.003-0.06,0.027-0.089,0.043c-0.021,0.011-0.04,0.022-0.058,0.038
+  c-0.009,0.007-0.016,0.016-0.025,0.022c-0.009,0.006-0.016,0.013-0.024,0.02c-0.007,0.005-0.012,0.013-0.019,0.021
+  c-0.009,0.01-0.018,0.019-0.029,0.027c-0.005,0.004-0.01,0.01-0.015,0.013c-0.008,0.005-0.018,0.01-0.025,0.016
+  c-0.004,0.004-0.002,0.006-0.004,0.011c-0.002,0.006-0.01,0.012-0.014,0.016c-0.012,0.014-0.026,0.022-0.041,0.032
+  c-0.006,0.004-0.017,0.009-0.021,0.015c-0.002,0.002-0.002,0.006-0.004,0.008c-0.003,0.003-0.007,0.004-0.01,0.006
+  c-0.011,0.008-0.015,0.022-0.025,0.031c-0.006,0.005-0.012,0.009-0.016,0.016c0.001-0.002-0.003,0.01-0.003,0.009
+  c-0.001,0.003,0,0.007-0.001,0.011c-0.002,0.012-0.013,0.03-0.023,0.037c-0.006,0.005-0.01,0.005-0.014,0.014
+  c-0.004,0.009-0.002,0.019-0.01,0.028c-0.008,0.01-0.016,0.019-0.025,0.029c-0.004,0.006-0.008,0.013-0.015,0.015
+  c-0.002-0.004,0-0.008,0.002-0.011c-0.007,0.003-0.007,0.012-0.015,0.017c-0.006,0.003-0.015,0.006-0.02,0.011
+  c-0.004,0.005-0.007,0.017,0,0.02c0.009,0.003,0.012-0.009,0.02-0.001c0.002,0.003-0.001,0.007,0.003,0.01
+  c0.005,0.003,0.003,0.001,0.009-0.001c0.006-0.001,0.011-0.008,0.016-0.009c0.008-0.001,0.011,0.008,0.016,0.011
+  c0.004,0.004,0.009,0.006,0.013,0.008c0.005,0.003,0.004,0.002,0.007,0.005c0.001,0.001,0.004,0.005,0.005,0.007
+  c0.003,0.004,0.007,0.007,0.01,0.01c0.005,0.006,0.006,0.009,0.013,0.014c0.003,0.002,0.01,0.007,0.012,0.009
+  c0.006,0.007,0.003,0.008,0,0.016c-0.001,0.003-0.001,0.006-0.003,0.009c-0.001,0.001-0.003,0.003-0.004,0.004
+  c-0.002,0.002-0.002,0.006-0.004,0.008c-0.001,0.001-0.003,0.003-0.004,0.004c-0.002,0.003-0.006,0.007-0.005,0.011
+  c0,0.002,0.001,0.004,0.003,0.005c0.003,0.014,0.009,0.025,0.009,0.039c0,0.015,0,0.028-0.015,0.037
+  c-0.006,0.004-0.013,0.002-0.02,0.004c-0.004,0.001-0.008,0.006-0.013,0.007c-0.008,0.002-0.012-0.001-0.02,0.004
+  c-0.007,0.004-0.011,0.004-0.02,0.004c-0.008,0-0.013,0-0.02-0.004c-0.007-0.004-0.008-0.005-0.016,0
+  c-0.012,0.007-0.022,0.015-0.035,0.021c-0.013,0.005-0.024,0.009-0.037,0.015c-0.004,0.002-0.008,0.004-0.012,0.007
+  c-0.008,0.004-0.01,0.007-0.015,0.013c-0.006,0.006-0.015,0.009-0.021,0.015c-0.006,0.007-0.009,0.016-0.015,0.022
+  c-0.012,0.01-0.029,0.006-0.039,0.016c-0.011,0.01-0.018,0.023-0.03,0.033c-0.005,0.005-0.01,0.006-0.015,0.009
+  c-0.005,0.004-0.008,0.007-0.013,0.012c-0.009,0.01-0.015,0.009-0.027,0.013c-0.006,0.002-0.01,0.008-0.015,0.012
+  c-0.012,0.012-0.02,0.025-0.03,0.038c-0.01,0.013-0.019,0.024-0.028,0.037c-0.004,0.007-0.006,0.011-0.007,0.019
+  c-0.001,0.003-0.003,0.005-0.004,0.009c0,0.004,0.001,0.008,0,0.012c-0.001,0.006-0.004,0.01-0.004,0.016
+  c0,0.004,0.001,0.007-0.001,0.011c-0.003,0.006-0.009,0.007-0.015,0.01c-0.016,0.007-0.024,0.01-0.032,0.027
+  c-0.003,0.008-0.007,0.016-0.012,0.024c-0.005,0.007-0.01,0.009-0.017,0.015c-0.006,0.005-0.007,0.011-0.011,0.017
+  c-0.004,0.004-0.01,0.008-0.014,0.013c-0.008,0.008-0.011,0.019-0.014,0.03c0.157,0.008,0.315,0.015,0.472,0.023
+  c0.297,0.375,0.594,0.75,0.891,1.125c-0.013,0.092-0.025,0.183-0.038,0.275c-0.505,0.161-1.213-0.164-1.514,0.484
+  c-0.301,0.649-0.023,0.006-0.022,0.016c0,0.005,0.006,0.009,0.007,0.013c0.002,0.005,0.001,0.01,0.001,0.015
+  c0,0.013-0.003,0.029,0.005,0.039c0.007,0.008,0.013,0.016,0.019,0.025c0.007,0.01,0.613,0.002,0.019,0.032
+  c-0.594,0.03,0.013,0.021,0.002,0.036c-0.005,0.007-0.012,0.012-0.016,0.02c-0.004,0.006-0.004,0.013-0.006,0.02
+  c-0.004,0.016-0.008,0.03-0.007,0.048c0.001,0.015,0.019,0.04-0.004,0.047c-0.008,0.002-0.016-0.001-0.024,0.003
+  c-0.007,0.004-0.012,0.008-0.02,0.01c-0.008,0.001-0.007-0.001-0.012,0.003c-0.001,0.001-0.003,0.006-0.005,0.008
+  c-0.003,0.004-0.008,0.007-0.012,0.012c-0.008,0.008-0.016,0.019-0.026,0.024c-0.01,0.006-0.019,0.002-0.029,0.004
+  c-0.007,0.002-0.01,0.005-0.02,0.004c-0.017-0.001-0.025-0.013-0.031-0.027c-0.008-0.018-0.012-0.033-0.025-0.047
+  c-0.004-0.004-0.009-0.009-0.01-0.014c-0.002-0.008-0.001-0.013-0.005-0.019c-0.008-0.013-0.02-0.019-0.032-0.027
+  c-0.013-0.009-0.025-0.019-0.04-0.024c-0.01-0.004-0.019-0.007-0.028-0.012s-0.015-0.004-0.024-0.006
+  c-0.015-0.004-0.036-0.006-0.052-0.003c-0.025,0.003-0.051,0.012-0.075,0.019c-0.012,0.003-0.037,0-0.037-0.015
+  c-0.01-0.001-0.016-0.004-0.028-0.004c-0.01,0-0.017-0.004-0.027-0.004c-0.011,0-0.018-0.004-0.028-0.004c-0.002,0-0.004,0-0.006,0
+  c-0.039,0.012-0.077,0.025-0.116,0.037c-0.003,0.006-0.005,0.014-0.009,0.02c-0.004,0.007-0.011,0.016-0.018,0.022
+  c-0.009,0.007-0.021,0.006-0.031,0.009c-0.008,0.003-0.006,0.005-0.008,0.012c-0.004,0.01-0.013,0.02-0.019,0.028
+  c-0.007,0.009-0.012,0.018-0.018,0.028c-0.002,0.003-0.004,0.007-0.006,0.011l0,0c0.004,0.006,0.007,0.014,0.006,0.02
+  c0,0.007-0.003,0.016-0.006,0.021c-0.004,0.008-0.01,0.012-0.016,0.019c-0.005,0.007-0.006,0.011-0.013,0.016
+  c-0.004,0.003-0.008,0.008-0.012,0.011c-0.005,0.003-0.012,0.004-0.015,0.01c-0.003,0.007,0.002,0.016-0.001,0.023
+  c-0.002,0.005-0.009,0.007-0.011,0.012c-0.002,0.005,0.001,0.011,0,0.016c-0.002,0.007-0.005,0.014-0.008,0.02
+  c-0.004,0.007-0.005,0.011-0.004,0.02c0,0.017,0.003,0.036-0.005,0.052c-0.006,0.014-0.01,0.029-0.015,0.044
+  c-0.006,0.015-0.013,0.028-0.017,0.043c-0.001,0.003-0.003,0.004-0.003,0.008c-0.001,0.004,0,0.009,0,0.013
+  c-0.001,0.003-0.003,0.006-0.004,0.008c0,0.004,0,0.008,0,0.011c-0.002,0.009-0.004,0.015-0.004,0.024v0.028
+  c0,0.02-0.003,0.036-0.009,0.055c-0.006,0.017-0.008,0.035-0.011,0.053c-0.002,0.008-0.006,0.015-0.004,0.024
+  c0.001,0.009,0.005,0.013,0.003,0.023c-0.001,0.002-0.003,0.006-0.003,0.009c-0.001,0.003,0,0.014-0.005,0.015
+  c-0.004,0.002-0.007-0.003-0.009-0.006c-0.002-0.006,0.001-0.006,0.002-0.013l-0.008,0.008c0.001-0.006-0.002-0.005-0.003-0.009
+  c-0.001-0.004-0.001-0.007-0.001-0.011c-0.001-0.007-0.004-0.015-0.007-0.021c-0.005-0.01-0.009-0.012-0.009-0.023
+  s-0.003-0.012-0.009-0.02c-0.005-0.007-0.008-0.011-0.006-0.019c0-0.003,0.008-0.02,0.002-0.024c-0.008-0.005-0.01,0.01-0.018,0.007
+  c-0.008-0.004-0.005-0.017-0.005-0.024c0-0.008,0-0.016,0-0.024c0-0.009,0.004-0.014,0.004-0.024c0-0.009,0.001-0.011,0.005-0.019
+  c0.004-0.007,0.003-0.015,0.003-0.025c0-0.008-0.005-0.012-0.004-0.019c0-0.009,0.007-0.016,0.008-0.024
+  c0.001-0.009-0.002-0.02,0-0.029c0.001-0.003,0.004-0.004,0.004-0.007c0.001-0.005-0.002-0.007-0.003-0.011
+  c0.003-0.002,0.005-0.011,0.006-0.014c0.001-0.006,0.002-0.013,0-0.019c-0.013,0.006-0.031,0.009-0.04,0.023
+  c-0.006,0.007-0.009,0.015-0.011,0.025c-0.002,0.011-0.01,0.02-0.012,0.032c-0.002,0.009-0.001,0.017-0.005,0.027
+  c-0.004,0.009-0.013,0.013-0.019,0.02c-0.005,0.006-0.003,0.01-0.005,0.017c-0.001,0.004-0.005,0.007-0.008,0.01
+  c-0.006,0.007-0.011,0.012-0.014,0.02c0.009,0.005-0.003,0.022-0.009,0.026c-0.005,0.004-0.009,0.005-0.012,0.011
+  c-0.002,0.005-0.002,0.011-0.005,0.016c-0.007,0.012-0.014,0.024-0.019,0.037c-0.005,0.014-0.007,0.029-0.013,0.043
+  c-0.003,0.008,0.002,0.008,0.002,0.016c0,0.011-0.011,0.008-0.016,0.013c-0.008,0.007-0.007,0.017-0.016,0.023
+  c-0.01,0.005-0.026,0.003-0.032-0.008c-0.003-0.005,0-0.015-0.001-0.02c0-0.009-0.002-0.015-0.005-0.023
+  c-0.002-0.006-0.002-0.011-0.003-0.017c-0.002-0.007-0.007-0.013-0.008-0.02c-0.001-0.008,0-0.012-0.004-0.02
+  c-0.003-0.004-0.01-0.012-0.011-0.017c-0.001-0.012,0.008-0.022,0.008-0.035c-0.001-0.014-0.008-0.024-0.011-0.037
+  c-0.003-0.01-0.002-0.025,0.006-0.032c0.008-0.006,0.026-0.005,0.028-0.018c0.001-0.007-0.006-0.015-0.009-0.02
+  c-0.003-0.008-0.001-0.013-0.002-0.021c-0.001-0.007-0.007-0.007,0.001-0.015c0.004-0.005,0.007-0.004,0.014-0.005
+  c0.002-0.008,0.001-0.012-0.005-0.018c-0.001-0.001-0.006-0.005-0.006-0.006c0-0.004,0.004-0.003,0.005-0.006
+  c0.001-0.005,0.002-0.006,0.003-0.012c0-0.004-0.002-0.01-0.001-0.013c0.002-0.007,0.009-0.013,0.013-0.019
+  c-0.005,0.004-0.011,0.013-0.014,0.019c-0.006,0.01-0.011,0.019-0.014,0.031c-0.001,0.01,0.005,0.03-0.008,0.033
+  c-0.009,0.002-0.019-0.002-0.028,0c0.007,0.007-0.007,0.017-0.012,0.024c-0.005,0.008-0.009,0.017-0.015,0.025
+  c-0.008,0.011-0.023,0.021-0.03,0.033c-0.004,0.007-0.006,0.026-0.018,0.026c0,0.014-0.035,0.019-0.044,0.027
+  c-0.008,0.007-0.011,0.016-0.021,0.02c-0.005,0.003-0.019,0.006-0.016,0.014c-0.009,0.007-0.013,0.022-0.019,0.032
+  c-0.01,0.018-0.017,0.041-0.03,0.057c-0.002,0.004-0.005,0.005-0.007,0.009c-0.002,0.003-0.003,0.007-0.005,0.011
+  c-0.008,0.013-0.02,0.016-0.034,0.021c-0.012,0.005-0.026,0.002-0.038,0.007c-0.009,0.004-0.012,0.01-0.018,0.017
+  c-0.004,0.004-0.005,0.005-0.013,0.004c-0.005-0.001-0.008-0.001-0.008-0.007c-0.198,0.776-0.304,1.59-0.304,2.428
+  c0,5.385,4.365,9.75,9.75,9.75s9.75-4.365,9.75-9.75C-15.25,49.098-15.794,47.324-16.736,45.824z M-17.781,55.174
+  c0.006,0.002,0.007,0.007,0.004,0.011c-0.003,0.005-0.005,0.009-0.007,0.014c-0.008,0.015-0.022,0.028-0.018,0.048
+  c0.002,0.015,0.013-0.002,0.018-0.007c0.008-0.008,0.014-0.017,0.023-0.024c0.008-0.006,0.018-0.008,0.027-0.015
+  c0.007-0.005,0.014-0.01,0.02-0.016c0.007-0.005,0.012-0.011,0.019-0.016c0.007-0.005,0.014-0.01,0.021-0.016
+  c0.005-0.005,0.009-0.01,0.013-0.016c0.004-0.004,0.008-0.006,0.012-0.011c0.007-0.009,0.014-0.018,0.026-0.02
+  c0.008-0.002,0.016-0.002,0.023-0.003c0.016-0.003,0.031-0.01,0.044-0.02c0.004-0.003,0.008-0.008,0.013-0.011
+  c0.006-0.003,0.011-0.005,0.016-0.009c0.006-0.004,0.013-0.009,0.02-0.011c0.004-0.001,0.01-0.002,0.014-0.004
+  c0.005-0.002,0.008-0.008,0.011-0.013c0.009-0.014,0.027-0.02,0.041-0.029c0.009-0.006,0.017-0.015,0.023-0.024
+  c0.006-0.008,0.011-0.017,0.019-0.023c0.017-0.015,0.034-0.03,0.054-0.042c0.007-0.004,0.015-0.011,0.02-0.019
+  c0.004-0.008,0.006-0.017,0.009-0.025c0.007-0.016,0.017-0.033,0.029-0.045c0.016-0.016,0.036-0.027,0.054-0.04
+  c0.005-0.005,0.011-0.008,0.017-0.012c0.005-0.004,0.008-0.009,0.012-0.013c0.01-0.01,0.013-0.024,0.02-0.036
+  c0.006-0.01,0.012-0.02,0.02-0.029c0.005-0.005,0.01-0.012,0.014-0.018c-0.017,0.004-0.027,0.013-0.036,0.026
+  c-0.002,0.002-0.005,0.005-0.007,0.007c-0.003,0.003-0.004,0.007-0.007,0.011c-0.006,0.008-0.015,0.013-0.022,0.02
+  c-0.009,0.009-0.016,0.019-0.024,0.028s-0.016,0.019-0.024,0.029c-0.004,0.004-0.007,0.009-0.012,0.013
+  c-0.004,0.004-0.009,0.007-0.013,0.011c-0.007,0.009-0.017,0.018-0.027,0.023c-0.003,0.002-0.011,0.005-0.015,0.003
+  c-0.003-0.003,0-0.006,0.001-0.009c0.004-0.01,0.008-0.018,0.015-0.025c0.007-0.006,0.013-0.015,0.019-0.022
+  c0.005-0.007,0.012-0.012,0.018-0.018c0.013-0.016,0.031-0.028,0.045-0.044c0.007-0.007,0.013-0.016,0.02-0.024
+  c0.006-0.008,0.013-0.016,0.019-0.024c0.005-0.006,0.009-0.013,0.014-0.02l-0.003,0.007c0.005-0.002,0.012-0.013,0.009-0.018
+  c-0.003,0.001-0.005,0.002-0.009,0.002c-0.004,0-0.005,0.001-0.009,0.004c-0.015,0.011-0.028,0.028-0.045,0.039
+  c-0.009,0.006-0.019,0.012-0.027,0.019c-0.007,0.005-0.012,0.012-0.019,0.018c-0.013,0.01-0.024,0.021-0.036,0.033
+  c-0.005,0.005-0.01,0.01-0.016,0.014c-0.005,0.003-0.008,0.002-0.014,0.002c-0.008,0.001-0.018,0.012-0.023,0.018
+  c-0.01,0.013-0.024,0.023-0.036,0.034c-0.002,0.003-0.007,0.006-0.008,0.01c-0.001,0.004-0.001,0.002,0.002,0.004
+  c0.003,0.004,0.005,0.003,0.004,0.01c0,0.003-0.003,0.013-0.007,0.013c-0.003,0.001-0.004-0.003-0.006-0.005
+  c-0.002-0.001-0.005-0.001-0.007-0.002c-0.002-0.002-0.002-0.004-0.005-0.004s-0.006,0.005-0.007,0.007
+  c-0.004,0.004-0.01,0.006-0.016,0.009c-0.004,0.003-0.013,0.004-0.013,0.011c0,0.005,0.006,0.006,0.005,0.011
+  c-0.001,0.005-0.006,0.005-0.009,0.007c-0.006,0.004-0.011,0.01-0.016,0.014c-0.016,0.015-0.028,0.032-0.043,0.047
+  c-0.006,0.007-0.013,0.012-0.019,0.019c-0.004,0.005-0.008,0.011-0.014,0.015c-0.008,0.007-0.016,0.014-0.027,0.017
+  c-0.007,0.003-0.014,0.005-0.021,0.008c-0.007,0.004-0.011,0.008-0.017,0.013c-0.007,0.007-0.016,0.012-0.023,0.017
+  c-0.016,0.013-0.032,0.027-0.049,0.038c-0.005,0.004-0.008,0.004-0.013,0.007c-0.011,0.005-0.02,0.014-0.03,0.021
+  c-0.015,0.011-0.032,0.02-0.045,0.033c-0.004,0.004-0.013,0.015-0.011,0.021c0.001,0.004,0.006,0.006,0.009,0.005
+  c0.004-0.001,0.009-0.007,0.012-0.01c0.001-0.001,0.006-0.006,0.008-0.003C-17.778,55.171-17.779,55.173-17.781,55.174z
+  M-17.109,54.626c0,0.004-0.001,0.011,0.003,0.014c0.002,0.001,0.01,0,0.013-0.001c0.009-0.002,0.019-0.008,0.025-0.015
+  c0.004-0.005,0.005-0.013,0.009-0.019c0.005-0.007,0.009-0.015,0.013-0.022c0.007-0.011,0.013-0.022,0.02-0.033
+  c0.01-0.015,0.022-0.029,0.03-0.044c0.018-0.032,0.031-0.067,0.051-0.097c0.019-0.029,0.04-0.056,0.059-0.085
+  c0.009-0.015,0.022-0.029,0.03-0.045c0.004-0.01,0.02-0.035,0.011-0.046c-0.01-0.013-0.031,0.024-0.034,0.029
+  c-0.014,0.017-0.026,0.034-0.039,0.051c-0.005,0.005-0.007,0.012-0.012,0.018c-0.002,0.004-0.003,0.007-0.005,0.011
+  c-0.001,0.003-0.004,0.005-0.005,0.008c-0.002,0.003-0.003,0.005-0.005,0.008c-0.003,0.003-0.005,0.006-0.007,0.009
+  c-0.005,0.007-0.01,0.014-0.014,0.021c-0.006,0.01-0.013,0.019-0.018,0.029c-0.005,0.008-0.011,0.015-0.016,0.023
+  c-0.006,0.01-0.015,0.019-0.021,0.029c-0.004,0.01-0.009,0.018-0.011,0.028c-0.008,0.028-0.03,0.05-0.046,0.073
+  c-0.007,0.011-0.017,0.02-0.024,0.031h-0.001c0.001-0.001,0.001-0.003,0.001-0.004l-0.005,0.011
+  c-0.001,0.001-0.001,0.002-0.002,0.002c0,0.001,0,0.002,0,0.003l0.002-0.005c0.001-0.002,0.003-0.004,0.004-0.007
+  C-17.104,54.61-17.108,54.618-17.109,54.626z M-17.08,54.48c0.01-0.013,0.024-0.024,0.032-0.038c0.01-0.017,0.017-0.035,0.025-0.052
+  c0.005-0.01,0.009-0.019,0.012-0.029c0.003-0.009,0.005-0.018,0.009-0.026c0.007-0.014,0.014-0.031,0.026-0.043
+  c0.004-0.004,0.007-0.006,0.01-0.01c0.003-0.005,0.005-0.011,0.009-0.016c0.004-0.006,0.01-0.012,0.014-0.017
+  c0.006-0.008,0.013-0.015,0.018-0.022c0.007-0.009,0.014-0.018,0.021-0.026c0.004-0.007,0.012-0.02,0.011-0.028
+  c-0.002,0.002-0.003,0.003-0.006,0.005c-0.006,0.004-0.016,0.004-0.022,0.009c-0.003,0.003-0.005,0.006-0.008,0.008
+  c-0.007,0.004-0.013,0.011-0.019,0.016c-0.007,0.007-0.012,0.015-0.019,0.021c-0.003,0.003-0.007,0.007-0.01,0.01
+  c-0.008,0.009-0.014,0.019-0.021,0.028c-0.009,0.012-0.02,0.022-0.029,0.034c-0.008,0.008-0.015,0.015-0.023,0.023
+  c-0.007,0.007-0.013,0.016-0.021,0.022c-0.008,0.006-0.015,0.014-0.022,0.021c-0.006,0.007-0.011,0.013-0.018,0.019
+  c-0.006,0.006-0.013,0.012-0.019,0.019c-0.004,0.005-0.009,0.008-0.013,0.014c-0.005,0.006-0.01,0.012-0.016,0.017
+  c-0.007,0.006-0.014,0.011-0.021,0.017c-0.005,0.004-0.008,0.009-0.014,0.012c-0.008,0.004-0.022,0.008-0.026,0.017
+  c-0.003,0.009-0.005,0.017-0.01,0.025c-0.006,0.011-0.011,0.021-0.019,0.031c-0.008,0.01-0.018,0.02-0.026,0.03
+  c-0.009,0.011-0.018,0.022-0.026,0.034c-0.003,0.005-0.005,0.01-0.008,0.014c-0.002,0.003-0.005,0.005-0.006,0.007
+  c-0.002,0.003-0.002,0.007-0.005,0.01c-0.002,0.001-0.005,0.002-0.007,0.004c-0.001,0.001-0.002,0.004-0.004,0.005
+  c-0.005,0.004-0.009,0.008-0.013,0.013c-0.003,0.004-0.007,0.007-0.011,0.011c-0.002,0.004-0.004,0.008-0.008,0.011
+  c-0.005,0.004-0.012,0.004-0.017,0.007c-0.013,0.01-0.02,0.026-0.034,0.035c-0.011,0.008-0.013,0.02-0.023,0.03
+  c-0.006,0.006-0.012,0.01-0.018,0.016c-0.003,0.003-0.012,0.01-0.013,0.015c-0.001,0.005,0.003,0.007,0.003,0.011h-0.001h0.001
+  c0.001,0.001,0.003,0,0.004-0.002c0.002-0.001,0.005-0.003,0.007-0.005c0.005-0.004,0.008-0.005,0.013-0.006
+  c0.003-0.001,0.007-0.003,0.009-0.005c0.005-0.004,0.009-0.007,0.014-0.009c0.022-0.012,0.04-0.031,0.057-0.048
+  c0.014-0.014,0.03-0.026,0.045-0.038c0.021-0.015,0.041-0.033,0.064-0.046c0.023-0.014,0.042-0.035,0.063-0.051
+  c0.02-0.017,0.04-0.034,0.059-0.052C-17.113,54.515-17.094,54.499-17.08,54.48z M-20.326,56.962c0.008,0.008,0.02,0.009,0.031,0.011
+  c0.004,0.001,0.008,0.001,0.011,0.002c0.001-0.007,0.004-0.009,0.006-0.016c0.006-0.022-0.02-0.036-0.037-0.032
+  c-0.004,0.001-0.013,0.003-0.018,0.007c0.001,0.005-0.001,0.012,0.001,0.018c0,0,0.001,0,0.001,0.001h0.031
+  C-20.309,56.958-20.317,56.961-20.326,56.962z M-16.279,52.758c-0.003,0.011-0.009,0.027-0.014,0.037
+  c-0.01,0.02-0.024,0.034-0.038,0.05c-0.01,0.011-0.027,0.034-0.042,0.028c0.006-0.009,0.007-0.018,0.007-0.029
+  c0.001-0.019,0.003-0.036,0.006-0.056c0.002-0.009-0.001-0.018,0-0.027c0-0.009,0.002-0.013,0.004-0.02
+  c0.002-0.008,0-0.015,0.001-0.022c0.001-0.009,0.004-0.014,0.006-0.022c0.005-0.022,0.006-0.045,0.017-0.065
+  c0.004-0.008,0.012-0.024,0.021-0.027c0.015-0.006,0.025,0.015,0.027,0.027c0.006,0.026,0.002,0.055,0.01,0.081
+  c0.003,0.011-0.003,0.017-0.005,0.028C-16.28,52.746-16.278,52.752-16.279,52.758z M-16.376,52.871
+  c0.001,0.001,0.002,0.002,0.003,0.002c-0.001,0.001-0.002,0.002-0.003,0.004V52.871z M-16.881,54.798
+  c-0.002,0.003-0.004,0.007-0.006,0.011c-0.003,0.005-0.008,0.007-0.01,0.011c-0.014,0.019-0.025,0.036-0.041,0.052
+  c-0.009,0.009-0.024,0.02-0.026,0.034v-0.021c0.012-0.01,0.016-0.025,0.021-0.038c0.003-0.007,0.007-0.01,0.01-0.016
+  c0.007-0.012,0.007-0.022,0.017-0.032c0.012-0.013,0.017-0.026,0.025-0.043c0.006-0.014,0.018-0.025,0.024-0.039
+  c0.003-0.007,0-0.01,0.006-0.015c0.011,0.016,0.008,0.045-0.001,0.062C-16.868,54.775-16.875,54.786-16.881,54.798z M-16.936,54.754
+  c-0.019,0.042-0.028,0.087-0.055,0.125c-0.011,0.015-0.021,0.027-0.029,0.044c-0.004,0.009-0.008,0.017-0.011,0.026
+  c-0.003,0.009-0.005,0.019-0.008,0.028c-0.007,0.022-0.015,0.04-0.029,0.059c-0.006,0.009-0.024,0.044-0.037,0.044
+  c0-0.001,0-0.001,0-0.002l-0.012,0.008c0.003-0.021,0.022-0.043,0.032-0.061c0.007-0.013,0.012-0.03,0.017-0.044
+  c0.009-0.02,0.02-0.037,0.029-0.057c0.013-0.027,0.033-0.048,0.042-0.077c0.004-0.011,0.005-0.022,0.01-0.033
+  c0.004-0.011,0.012-0.021,0.016-0.033c0.004-0.01,0.005-0.021,0.008-0.031c0.004-0.012,0.011-0.022,0.015-0.034
+  c0.006-0.017,0.008-0.036,0.015-0.055c0.007-0.017,0.015-0.031,0.025-0.047c0.006-0.011,0.027-0.04,0.031-0.012
+  c0.004,0.026-0.017,0.048-0.026,0.071C-16.914,54.7-16.923,54.727-16.936,54.754z M-17.041,54.825
+  c-0.007,0.028-0.023,0.052-0.033,0.079c-0.007,0.017-0.012,0.036-0.021,0.053c-0.009,0.019-0.023,0.036-0.032,0.056
+  c-0.01,0.018-0.017,0.038-0.028,0.055c-0.009,0.016-0.018,0.03-0.025,0.047c-0.013,0.028-0.033,0.053-0.046,0.08
+  c-0.007,0.018-0.015,0.036-0.022,0.055c-0.008,0.019-0.028,0.035-0.036,0.055c-0.004,0.01-0.006,0.017-0.013,0.025
+  c-0.005,0.004-0.019,0.022-0.021,0.007V55.32c0.001-0.053,0.038-0.097,0.064-0.141c0.006-0.01,0.009-0.019,0.013-0.028
+  c0.005-0.008,0.011-0.013,0.017-0.021c0.006-0.009,0.011-0.018,0.015-0.028c0.005-0.014,0.006-0.027,0.013-0.04
+  c0.005-0.01,0.015-0.017,0.02-0.026c0.004-0.008,0.004-0.013,0.006-0.021c0.004-0.01,0.011-0.023,0.016-0.032
+  c0.007-0.012,0.016-0.021,0.023-0.033c0.008-0.015,0.015-0.03,0.026-0.043c0.015-0.021,0.022-0.041,0.028-0.066
+  c0.002-0.009,0.007-0.018,0.011-0.027c0.004-0.011,0.003-0.026,0.013-0.034c0.009-0.007,0.023-0.007,0.023,0.007
+  c0,0.001-0.004,0.014-0.005,0.016C-17.037,54.81-17.039,54.818-17.041,54.825z M-17.292,55.364c0.006-0.01,0.009-0.02,0.016-0.029
+  c0.007-0.009,0.015-0.016,0.022-0.026c0.01-0.015,0.027-0.024,0.038-0.039c0.007-0.009,0.012-0.022,0.019-0.032
+  c0.005-0.006,0.011-0.01,0.015-0.016c0.005-0.005,0.012-0.012,0.015-0.017c0.01-0.014,0.015-0.03,0.023-0.044
+  c0.012-0.022,0.032-0.037,0.044-0.059c0.014-0.026,0.025-0.05,0.041-0.075c0.008-0.012,0.018-0.021,0.026-0.033
+  c0.007-0.013,0.013-0.036,0.024-0.045c0.012-0.009,0.013-0.001,0.012,0.012c0,0.016-0.007,0.029-0.015,0.043
+  c-0.014,0.027-0.03,0.055-0.043,0.082c-0.007,0.013-0.011,0.026-0.018,0.038c-0.004,0.007-0.008,0.016-0.012,0.023
+  c-0.005,0.006-0.01,0.007-0.014,0.015c-0.013,0.025-0.025,0.045-0.045,0.066c-0.012,0.013-0.019,0.027-0.028,0.042
+  c-0.009,0.015-0.022,0.026-0.032,0.039c-0.015,0.02-0.027,0.041-0.043,0.06c-0.014,0.016-0.026,0.031-0.038,0.049
+  c-0.011,0.016-0.024,0.029-0.032,0.045c-0.008,0.018-0.017,0.036-0.029,0.052c-0.01,0.012-0.021,0.022-0.03,0.035
+  c-0.014,0.017-0.03,0.034-0.041,0.053c-0.008,0.012-0.013,0.025-0.019,0.038c-0.006,0.012-0.014,0.02-0.02,0.032
+  c-0.003,0.007-0.007,0.014-0.01,0.021c-0.004,0.007-0.006,0.017-0.01,0.025v-0.001l-0.011-0.011
+  c0.002-0.001,0.003-0.001,0.005-0.002c0-0.007,0.005-0.018,0.007-0.024c0.005-0.015,0.021-0.028,0.028-0.042
+  c0.011-0.022,0.019-0.044,0.033-0.063c0.004-0.007,0.009-0.015,0.014-0.021c0.006-0.006,0.013-0.01,0.018-0.017
+  c0.013-0.018,0.018-0.042,0.03-0.06c0.013-0.02,0.028-0.036,0.035-0.059C-17.31,55.4-17.303,55.382-17.292,55.364z M-17.472,55.592
+  c-0.009,0.016-0.017,0.031-0.024,0.048c-0.006,0.014-0.015,0.021-0.022,0.034c-0.009,0.016-0.013,0.034-0.019,0.052
+  c-0.006,0.018-0.018,0.034-0.027,0.051c-0.006,0.012-0.015,0.022-0.022,0.033c-0.005,0.007-0.008,0.015-0.014,0.022
+  c-0.004,0.006-0.009,0.01-0.013,0.016c-0.019,0.025-0.037,0.041-0.064,0.055c-0.014,0.006-0.028,0.01-0.043,0.014
+  c-0.024,0.006-0.039,0.02-0.059,0.031c-0.013,0.006-0.026,0.012-0.039,0.018c-0.013,0.006-0.026,0.011-0.039,0.014
+  c-0.009,0.003-0.018,0.008-0.027,0.01c-0.007,0.001-0.015-0.002-0.022-0.001s-0.015,0.005-0.022,0.007
+  C-17.942,56.001-17.955,56-17.971,56l-0.011-0.016c-0.006,0.008-0.024,0.007-0.032,0.006c-0.008-0.002-0.013-0.005-0.021-0.006
+  s-0.014,0.001-0.022-0.001c-0.01-0.002-0.024-0.006-0.03-0.015c-0.004-0.006-0.009-0.026-0.008-0.033
+  c0.001-0.016,0.021-0.039,0.033-0.049c0.008-0.007,0.021-0.009,0.031-0.015c0.011-0.006,0.02-0.013,0.029-0.022
+  c0.006-0.006,0.012-0.011,0.02-0.016c0.004-0.002,0.012-0.008,0.017-0.007c0.005,0,0.005,0.005,0.01,0.006
+  c0.011,0.003,0.024-0.004,0.033-0.01c0.009-0.006,0.016-0.009,0.026-0.013c0.016-0.007,0.036-0.021,0.056-0.016
+  c0.01,0.003,0.015,0.006,0.027,0.006c0.014,0,0.024,0.006,0.038,0.005c0.012,0,0.02,0.004,0.031,0.007
+  c0.007,0.002,0.003,0.004,0.012,0.003c0.006,0,0.01-0.004,0.017-0.004c0.011-0.001,0.019,0.001,0.028-0.004
+  c0.01-0.005,0.018-0.011,0.028-0.017c0.016-0.009,0.032-0.022,0.047-0.035c0.016-0.013,0.026-0.034,0.042-0.049
+  c0.016-0.014,0.025-0.028,0.039-0.044c0.012-0.014,0.019-0.03,0.029-0.047c0.011-0.017,0.013-0.04,0.025-0.056
+  c0.006-0.009,0.036-0.043,0.044-0.042c0.006,0.013-0.008,0.028-0.014,0.038C-17.455,55.567-17.465,55.579-17.472,55.592z
+  M-18.013,56.088c0.011-0.001,0.025,0.002,0.037,0c0.015-0.003,0.03-0.015,0.043-0.022c0.007-0.004,0.011-0.009,0.018-0.002
+  c0.01,0.01,0.001,0.019-0.007,0.026c-0.014,0.012-0.029,0.023-0.043,0.031c-0.008,0.005-0.042,0.033-0.044,0.015l0.002-0.005
+  c-0.016,0.001-0.034-0.006-0.051-0.005c-0.013,0-0.047-0.01-0.044-0.028c0.004-0.018,0.04-0.025,0.054-0.02
+  C-18.034,56.082-18.029,56.088-18.013,56.088z M-18.048,56.206c0.02-0.008,0.045-0.013,0.066-0.01
+  c0.013,0.002,0.012,0.002,0.007,0.012c-0.005,0.01-0.01,0.018-0.018,0.025c-0.015,0.013-0.033,0.012-0.049,0.022
+  c-0.006,0.003-0.009,0.01-0.015,0.014c-0.007,0.004-0.013,0.003-0.022,0.005c-0.001,0.002-0.003,0.004-0.006,0.004
+  c-0.006,0.002-0.011,0-0.017,0.001c-0.003,0.001-0.01,0.002-0.015,0.003l0.004-0.004c-0.015,0.002-0.05-0.02-0.049-0.038
+  c0-0.011,0.014-0.02,0.023-0.024c0.008-0.002,0.016-0.003,0.025-0.004c0.01,0,0.007,0.004,0.014,0.005
+  C-18.08,56.221-18.066,56.213-18.048,56.206z M-18.259,56.168c-0.008,0.003-0.015,0.01-0.022,0.012
+  c-0.009,0.003-0.026,0.002-0.033,0.011l0.006-0.011c-0.005-0.023,0.023-0.051,0.038-0.066c0.006-0.005,0.015-0.011,0.021-0.016
+  c0.011-0.007,0.013-0.016,0.022-0.025c0.007-0.006,0.014-0.007,0.021-0.013c0.006-0.004,0.011-0.012,0.016-0.018
+  c0.006-0.006,0.024-0.03,0.034-0.026c0.023,0.009-0.045,0.111-0.059,0.126C-18.228,56.156-18.242,56.16-18.259,56.168z
+  M-18.196,55.957c-0.007,0.017-0.013,0.039-0.024,0.055c-0.011,0.015-0.027,0.018-0.041,0.03c-0.009,0.009-0.018,0.016-0.027,0.025
+  c-0.011,0.011-0.017,0.025-0.031,0.015l0.005-0.011c-0.001,0-0.003,0-0.005-0.001c0.001-0.01,0.009-0.018,0.015-0.026
+  c0.012-0.018,0.024-0.036,0.038-0.053c0.004-0.004,0.008-0.009,0.013-0.013c0.003-0.004,0.003-0.01,0.006-0.015
+  c0.005-0.007,0.014-0.01,0.019-0.017c0.014-0.018,0.014-0.036,0.035-0.049c0.005-0.003,0.024-0.02,0.031-0.016
+  c0.008,0.007-0.007,0.022-0.009,0.027C-18.178,55.925-18.188,55.94-18.196,55.957z M-18.255,56.79c0.002,0.007,0.003,0.018,0,0.025
+  c-0.003,0.008-0.013,0.011-0.009,0.022c0.02-0.006,0.027-0.032,0.039-0.046c0.005-0.008,0.014-0.012,0.02-0.019
+  c0.012-0.013,0.016-0.033,0.026-0.048c0.011-0.019,0.029-0.036,0.049-0.045c0.008-0.003,0.02-0.005,0.027-0.011
+  c0.004-0.002,0.007-0.01,0.012-0.01c0.008,0.001,0.007,0.012,0.006,0.018c-0.003,0.01-0.008,0.021-0.011,0.032
+  c-0.004,0.009-0.01,0.022-0.011,0.033c-0.004,0.024-0.011,0.044-0.028,0.063c-0.01,0.011-0.021,0.023-0.028,0.036
+  c-0.008,0.014-0.012,0.025-0.027,0.035c-0.012,0.008-0.049,0.035-0.063,0.028c0.001-0.012,0.027-0.021,0.036-0.028
+  c0.005-0.004,0.01-0.01,0.013-0.015c0.004-0.004,0.014-0.015,0.015-0.02c-0.012-0.006-0.026,0.005-0.036,0.011
+  c-0.013,0.007-0.025,0.014-0.036,0.024c-0.01,0.01-0.022,0.019-0.032,0.029c-0.005,0.004-0.01,0.007-0.014,0.012
+  c-0.006,0.007-0.006,0.018-0.012,0.025c-0.009,0.011-0.02,0.018-0.022,0.034c-0.001,0.006,0.002,0.014-0.001,0.02
+  c-0.003,0.005-0.011,0.009-0.015,0.012c-0.014,0.01-0.025,0.018-0.035,0.032c-0.007,0.01-0.014,0.022-0.025,0.03
+  c-0.018,0.012-0.046,0.026-0.053,0.048c-0.003,0.007-0.002,0.011-0.006,0.017c-0.003,0.005-0.009,0.01-0.012,0.015
+  c-0.008,0.011-0.014,0.024-0.021,0.034c-0.017,0.021-0.044,0.036-0.066,0.051c-0.009,0.006-0.016,0.015-0.023,0.022
+  c-0.005,0.004-0.011,0.007-0.016,0.011c0.007-0.009,0.008-0.021,0.012-0.031c0.004-0.011,0.006-0.022,0.011-0.033
+  c0.007-0.016,0.013-0.034,0.022-0.049c0.005-0.009,0.003-0.012,0.005-0.022c0.001-0.006,0.006-0.012,0.009-0.018
+  c0.005-0.009,0.01-0.017,0.017-0.026c0.009-0.015,0.023-0.024,0.034-0.037c0.007-0.01,0.015-0.021,0.023-0.032
+  c0.008-0.011,0.02-0.015,0.031-0.023c0.013-0.009,0.022-0.021,0.031-0.034c0.003-0.004,0.005-0.005,0.007-0.009
+  c0.003-0.006,0.003-0.016,0.007-0.021c0.006-0.007,0.015-0.009,0.022-0.016c0.008-0.009,0.01-0.017,0.016-0.027
+  c0.007-0.012,0.02-0.018,0.027-0.029c0.01-0.012,0.017-0.018,0.03-0.028C-18.291,56.817-18.276,56.799-18.255,56.79z
+  M-18.624,57.274c0.001,0,0.002-0.001,0.003-0.002c-0.001,0.002-0.003,0.004-0.003,0.007V57.274z M-18.13,56.418
+  c-0.021,0.014-0.052,0.017-0.071,0.035l-0.009,0.01c-0.009-0.012-0.014-0.014-0.005-0.027c0.012-0.016,0.028-0.03,0.043-0.044
+  c0.021-0.021,0.044-0.035,0.07-0.049c0.011-0.007,0.019-0.016,0.03-0.022c0.012-0.006,0.025-0.008,0.036-0.016
+  c0.01-0.008,0.022-0.019,0.031-0.028c0.006-0.007,0.033-0.055,0.04-0.037c0.004,0.01-0.011,0.029-0.016,0.038
+  c-0.008,0.017-0.015,0.03-0.028,0.044c-0.018,0.017-0.037,0.034-0.056,0.048c-0.01,0.008-0.019,0.018-0.03,0.024
+  C-18.107,56.401-18.118,56.41-18.13,56.418z M-17.835,56.051c0.012-0.008,0.022-0.019,0.032-0.027
+  c0.013-0.01,0.026-0.019,0.039-0.028c0.009-0.006,0.017-0.012,0.025-0.019c0.013-0.009,0.026-0.019,0.036-0.031
+  c0.011-0.012,0.021-0.031,0.037-0.037c0.022-0.01,0.017,0.015,0.009,0.026c-0.01,0.016-0.02,0.034-0.033,0.048
+  c-0.011,0.013-0.022,0.022-0.035,0.032c-0.013,0.011-0.022,0.022-0.034,0.034c-0.012,0.013-0.027,0.02-0.039,0.032
+  c-0.009,0.008-0.017,0.017-0.026,0.024c-0.01,0.009-0.021,0.015-0.029,0.026c-0.008,0.012-0.016,0.027-0.031,0.033l-0.005-0.006
+  c-0.012,0.003-0.032-0.006-0.034-0.018c-0.005-0.027,0.026-0.05,0.044-0.063C-17.864,56.066-17.85,56.06-17.835,56.051z
+  M-17.847,56.169c0.005-0.008,0.011-0.015,0.018-0.021c0.013-0.011,0.024-0.022,0.036-0.033c0.011-0.01,0.025-0.019,0.035-0.031
+  c0,0.017-0.013,0.035-0.023,0.048c-0.012,0.017-0.017,0.035-0.032,0.049c-0.006,0.005-0.01,0.011-0.015,0.017
+  c-0.007,0.008-0.01,0.006-0.018,0.009c-0.019,0.008-0.021,0.013-0.022,0.033l-0.011-0.011l-0.001,0.003
+  c-0.008-0.006,0.006-0.031,0.012-0.038C-17.861,56.185-17.853,56.179-17.847,56.169z M-17.809,56.229
+  c0.012-0.01,0.023-0.022,0.034-0.033c0.009-0.008,0.011-0.017,0.018-0.026c0.008-0.012,0.022-0.021,0.031-0.034
+  c0.003-0.004,0.01-0.017,0.016-0.016c0.012,0,0.004,0.02,0.002,0.026c-0.004,0.011-0.008,0.026-0.015,0.036
+  c-0.007,0.01-0.017,0.016-0.025,0.025c-0.013,0.017-0.026,0.032-0.042,0.045c-0.02,0.017-0.038,0.036-0.061,0.048l0.005-0.017
+  C-17.873,56.28-17.814,56.233-17.809,56.229z M-17.71,56.066l-0.005,0.011c-0.021-0.023-0.007-0.047,0.011-0.064
+  c0.015-0.016,0.032-0.03,0.048-0.045c0.018-0.016,0.036-0.032,0.052-0.049c0.011-0.011,0.02-0.022,0.03-0.033
+  c0.019-0.02,0.03-0.045,0.048-0.065c0.03-0.036,0.067-0.076,0.087-0.12c0.004-0.009,0.009-0.018,0.013-0.027
+  c0.008-0.016,0.017-0.033,0.026-0.048c0.004-0.006,0.038-0.051,0.048-0.044c0.014,0.009-0.017,0.057-0.022,0.064
+  c-0.009,0.016-0.022,0.029-0.031,0.044c-0.008,0.012-0.018,0.021-0.026,0.033s-0.015,0.023-0.024,0.035
+  c-0.012,0.015-0.024,0.029-0.033,0.047c-0.013,0.026-0.033,0.046-0.049,0.07c-0.029,0.044-0.072,0.079-0.098,0.124
+  c-0.007,0.014-0.019,0.031-0.031,0.04c-0.014,0.009-0.027,0.027-0.043,0.032L-17.71,56.066z M-19.005,57.415l-0.022,0.006
+  c0.005-0.004,0.007-0.013,0.01-0.018c0.003-0.007,0.007-0.014,0.012-0.02c0.007-0.009,0.026-0.027,0.038-0.028
+  c0.017-0.001,0.021,0.016,0.013,0.028c-0.005,0.006-0.014,0.012-0.02,0.017C-18.982,57.408-18.993,57.418-19.005,57.415z
+  M-19.109,57.361h-0.01l-0.005-0.001c0.006-0.014,0.039-0.065,0.06-0.053c0.002,0.002,0.009,0.015,0.009,0.017
+  c0.001,0.01-0.004,0.012-0.01,0.021C-19.076,57.36-19.093,57.381-19.109,57.361z M-19.194,57.357
+  c-0.007,0.003-0.029,0.011-0.023-0.007h-0.017c0.015-0.005,0.022-0.022,0.032-0.034c0.004-0.005,0.01-0.013,0.016-0.016
+  c0.007-0.004,0.015-0.003,0.022-0.008c0.001,0.009,0.012,0.012,0.013,0.02c0,0.007-0.017,0.024-0.021,0.029
+  C-19.179,57.348-19.185,57.353-19.194,57.357z M-19.499,57.514c-0.001,0.002-0.001,0.003-0.001,0.005l-0.006-0.006
+  c-0.001,0.001-0.002,0.001-0.003,0.001c0.019-0.023,0.036-0.05,0.063-0.065c0.014-0.007,0.025-0.011,0.039-0.022
+  c0.01-0.008,0.016-0.022,0.031-0.016c-0.002,0.025-0.035,0.052-0.053,0.065C-19.45,57.491-19.474,57.511-19.499,57.514z
+  M-19.589,57.621c-0.005,0.009-0.012,0.015-0.019,0.023c-0.011,0.012-0.013,0.008-0.027,0.012c-0.008,0.002-0.014,0.009-0.023,0.01
+  c-0.005,0-0.013-0.001-0.019-0.001c0.003-0.001,0.005-0.003,0.008-0.005l-0.016,0.006c-0.007-0.001-0.011-0.008-0.016-0.013
+  c0.002-0.008,0.009-0.011,0.016-0.016c0.011-0.008,0.021-0.018,0.032-0.027c0.008-0.005,0.011-0.013,0.018-0.019
+  s0.017-0.012,0.026-0.016c0.017-0.01,0.027-0.022,0.038-0.036c0.004-0.006,0.013-0.017,0.02-0.022
+  c0.011-0.007,0.016-0.005,0.018,0.007c0.003,0.022-0.012,0.035-0.026,0.051C-19.571,57.589-19.579,57.605-19.589,57.621z
+  M-19.772,57.757c-0.03,0.027-0.066,0.047-0.098,0.071c-0.016,0.011-0.027,0.023-0.038,0.039c-0.011,0.015-0.024,0.018-0.039,0.026
+  c-0.014,0.007-0.024,0.027-0.039,0.033c-0.006,0.002-0.013,0.001-0.019,0.002c-0.002,0.001-0.004,0.001-0.006,0.002
+  c-0.004-0.005,0.008-0.02,0.011-0.025c0.013-0.018,0.034-0.026,0.047-0.043c0.01-0.014,0.022-0.026,0.034-0.038
+  c0.01-0.012,0.017-0.023,0.025-0.035c0.009-0.012,0.027-0.022,0.039-0.031c0.018-0.013,0.03-0.031,0.049-0.045
+  c0.013-0.01,0.024-0.016,0.039-0.021c0.011-0.004,0.011-0.001,0.022,0.001c0.009,0.002,0.014-0.002,0.021-0.005
+  c0.004,0.008-0.012,0.03-0.017,0.037C-19.75,57.736-19.761,57.747-19.772,57.757z M-20.016,57.932c0.002,0,0.004-0.001,0.005-0.002
+  c0.001,0.001,0.002,0.002,0.005,0.002H-20.016z M-20.023,57.932h0.007c-0.004,0.003-0.008,0.005-0.01,0.007
+  C-20.024,57.937-20.023,57.935-20.023,57.932z M-19.994,57.988c-0.005,0.009-0.017,0.017-0.023,0.025
+  c-0.008,0.009-0.016,0.018-0.022,0.028c-0.007,0.011-0.016,0.017-0.027,0.024c-0.01,0.005-0.017,0.014-0.027,0.02
+  c-0.019,0.011-0.04,0.015-0.056,0.031c-0.006,0.006-0.015,0.018-0.022,0.022c-0.004,0.003-0.011,0.003-0.015,0
+  c-0.002,0-0.003-0.001-0.003-0.002c0.001-0.003,0.003-0.005,0.004-0.007c0.009-0.014,0.019-0.026,0.032-0.036
+  c0.011-0.009,0.023-0.02,0.032-0.031c0.012-0.015,0.015-0.027,0.032-0.037c0.011-0.007,0.017-0.011,0.023-0.022
+  c0.008-0.014,0.013-0.007,0.027-0.012c0.01-0.003,0.017-0.013,0.027-0.015C-19.999,57.972-19.986,57.974-19.994,57.988z
+  M-20.192,58.127c0,0.003,0.001,0.006,0.003,0.009c-0.004,0.007-0.008,0.014-0.013,0.019L-20.192,58.127z M-20.079,57.926
+  c-0.013,0.008-0.028,0.019-0.038,0.032c-0.006,0.009-0.006,0.02-0.01,0.029c-0.003,0.006-0.01,0.011-0.014,0.016
+  c-0.004,0.005-0.006,0.012-0.011,0.017c-0.008,0.009-0.019,0.018-0.028,0.025c-0.007,0.005-0.027,0.013-0.027,0.022
+  c0.003,0.002,0.005,0.002,0.008,0.001c-0.006,0.006-0.01,0.015-0.015,0.022c-0.011,0.014-0.026,0.026-0.038,0.037
+  c-0.018,0.015-0.049,0.026-0.071,0.035c-0.023,0.01-0.045,0.02-0.063,0.038c-0.011,0.012-0.022,0.026-0.035,0.036
+  c-0.016,0.012-0.033,0.022-0.048,0.034c-0.005,0.004-0.011,0.01-0.017,0.015c-0.007,0.005-0.022,0.01-0.026,0.019
+  c-0.008,0.022,0.037-0.003,0.043-0.007s0.02-0.012,0.022,0c0.004,0.014-0.016,0.017-0.023,0.02c-0.009,0.004-0.017,0.01-0.026,0.014
+  c-0.01,0.004-0.02,0.009-0.029,0.014c-0.008,0.004-0.017,0.008-0.026,0.01c-0.005,0.002-0.01,0.003-0.016,0.006
+  c-0.006,0.002-0.017,0.005-0.022,0.008c-0.005,0.003-0.005,0.007-0.01,0.01c-0.004,0.002-0.011,0.004-0.016,0.007
+  c-0.007,0.003-0.015,0.006-0.022,0.009c-0.021,0.009-0.042,0.023-0.054,0.043c-0.008,0.015-0.009,0.033-0.028,0.033
+  c-0.006,0-0.012-0.001-0.017,0c-0.006,0.001-0.007,0.003-0.012,0.004c-0.009,0.003-0.017,0.004-0.026,0.007
+  c-0.004,0.002-0.007,0.002-0.012,0.004c-0.005,0.002-0.01,0.006-0.015,0.007c-0.012,0.003-0.021-0.002-0.033,0.004
+  c-0.01,0.004-0.02,0.009-0.028,0.016c-0.019,0.015-0.047,0.017-0.064,0.034c-0.009,0.01-0.016,0.021-0.027,0.028
+  c-0.009,0.005-0.019,0.006-0.027,0.012c-0.012,0.006-0.021,0.013-0.033,0.019c-0.013,0.006-0.019,0.01-0.033,0.013
+  c-0.011,0.003-0.022,0.006-0.033,0.01c-0.009,0.004-0.017,0.004-0.027,0.005c-0.009,0.002-0.018,0.007-0.027,0.011
+  c-0.01,0.005-0.021,0.007-0.031,0.012c-0.032,0.016-0.07,0.025-0.098,0.05c-0.01,0.008-0.022,0.016-0.034,0.021
+  c-0.006,0.003-0.011,0.002-0.017,0.004c-0.004,0.002-0.005,0.005-0.01,0.006s-0.012-0.001-0.017,0c-0.006,0-0.008,0.003-0.012,0.004
+  c-0.012,0.003-0.015,0.004-0.024,0.013c-0.008,0.009-0.013,0.009-0.023,0.014c-0.02,0.008-0.039,0.019-0.058,0.029
+  c-0.024,0.012-0.049,0.024-0.073,0.032c-0.018,0.006-0.032,0.014-0.048,0.024c-0.02,0.012-0.049,0.018-0.072,0.024
+  c-0.011,0.003-0.022-0.001-0.032,0.001c-0.012,0.002-0.022,0.012-0.033,0.016c-0.012,0.003-0.067,0.017-0.048-0.015
+  c0.004-0.007,0.016-0.01,0.022-0.016c0.008-0.006,0.013-0.015,0.019-0.023c0.012-0.015,0.022-0.03,0.033-0.045
+  c0.008-0.01,0.009-0.025,0.018-0.036c0.003,0,0.006-0.001,0.009-0.001c0.002-0.004,0.004-0.007,0.007-0.009
+  c0.004-0.004,0.01-0.011,0.016-0.011c0.006-0.001,0.013,0.006,0.022,0.004c0.009-0.001,0.014-0.006,0.02-0.012
+  c0.011-0.011,0.017-0.026,0.029-0.037c0.014-0.014,0.032-0.019,0.049-0.028c0.016-0.009,0.026-0.025,0.042-0.033
+  c0.013-0.007,0.028-0.012,0.039-0.021c0.014-0.012,0.016-0.025,0.025-0.039c-0.011-0.008-0.015-0.008-0.029-0.011
+  c-0.011-0.002-0.025-0.012-0.039-0.01c-0.006,0.002-0.011,0.005-0.017,0.006c-0.006,0.002-0.015,0-0.021,0
+  c-0.014,0-0.03-0.002-0.043,0.001c-0.011,0.003-0.023,0.013-0.034,0.02c-0.013,0.009-0.028,0.011-0.043,0.016
+  c-0.027,0.008-0.046,0.02-0.07,0.035c-0.009,0.006-0.019,0.013-0.029,0.019c-0.013,0.008-0.024,0.013-0.037,0.019
+  c-0.013,0.007-0.026,0.012-0.038,0.02c-0.013,0.008-0.029,0.008-0.044,0.013c-0.012,0.004-0.022,0.014-0.034,0.019
+  c-0.012,0.007-0.027,0.01-0.041,0.013c-0.004,0.002-0.006,0.004-0.012,0.005c-0.007,0.001-0.015,0-0.022,0
+  c-0.014,0-0.022,0.008-0.037,0.004c-0.002-0.011,0.008-0.014,0.016-0.019c0.008-0.005,0.013-0.013,0.021-0.018
+  c0.015-0.008,0.029-0.019,0.044-0.027c0.007-0.004,0.014-0.006,0.022-0.009c0.012-0.006,0.016-0.017,0.025-0.025
+  c0.014-0.013,0.026-0.017,0.034-0.035c-0.011-0.015-0.046,0.004-0.059,0.01c-0.022,0.011-0.044,0.019-0.065,0.03
+  c-0.024,0.013-0.048,0.017-0.071,0.03c-0.011,0.007-0.016,0.008-0.027,0.011c-0.007,0.002-0.01,0.004-0.017,0.004
+  c-0.007,0.001-0.014,0-0.022,0.002c-0.021,0.005-0.042,0.014-0.06,0.024c-0.007,0.005-0.018,0.007-0.027,0.011
+  c-0.019,0.008-0.036,0.022-0.054,0.033c-0.008,0.005-0.018,0.009-0.027,0.013c-0.01,0.005-0.019,0.01-0.027,0.015
+  c-0.008,0.004-0.015,0.008-0.022,0.013c-0.011,0.006-0.019,0.012-0.029,0.019c-0.004,0.003-0.01,0.003-0.015,0.006
+  c-0.005,0.003-0.011,0.009-0.016,0.012c-0.013,0.009-0.021,0.022-0.033,0.032c-0.007,0.006-0.015,0.017-0.023,0.021
+  c-0.004,0.002-0.009,0-0.014,0.002c-0.004,0.001-0.012,0.008-0.016,0.011c-0.013,0.009-0.025,0.022-0.039,0.03
+  c-0.009,0.004-0.018,0.008-0.026,0.013c-0.004,0.003-0.008,0.007-0.012,0.01c-0.009,0.006-0.008,0.007-0.013,0.015
+  c-0.012,0.018-0.013,0.04-0.019,0.061c-0.003,0.011,0,0.019-0.005,0.028c-0.005,0.011-0.014,0.02-0.022,0.028
+  c-0.012,0.011-0.023,0.024-0.035,0.035c-0.016,0.014-0.035,0.024-0.049,0.038c-0.006,0.006-0.007,0.011-0.011,0.017
+  c-0.005,0.006-0.013,0.009-0.019,0.013c-0.019,0.013-0.034,0.03-0.053,0.042c-0.017,0.011-0.029,0.023-0.042,0.037
+  c-0.013,0.013-0.028,0.019-0.043,0.029c-0.017,0.01-0.035,0.02-0.054,0.027c-0.01,0.004-0.017,0.003-0.027,0.005
+  c-0.012,0.002-0.021,0.016-0.033,0.021c-0.006,0.003-0.015,0.004-0.02,0.008c-0.008,0.006-0.016,0.013-0.024,0.019
+  c-0.015,0.011-0.032,0.024-0.049,0.033c-0.016,0.009-0.036,0.019-0.053,0.03c-0.014,0.009-0.028,0.02-0.044,0.027
+  c-0.015,0.006-0.029,0.005-0.044,0.013c-0.01,0.006-0.019,0.012-0.027,0.018c-0.017,0.012-0.036,0.023-0.055,0.033
+  c-0.027,0.015-0.052,0.037-0.081,0.05c-0.016,0.007-0.032,0.011-0.048,0.016c-0.014,0.005-0.027,0.017-0.043,0.016
+  c0.002-0.002,0.004-0.003,0.004-0.006l-0.011-0.006c-0.001,0.012-0.013,0.005-0.011-0.005c0.001-0.007,0.01-0.013,0.015-0.017
+  c0.013-0.014,0.03-0.021,0.045-0.033c0.008-0.007,0.018-0.014,0.026-0.021c0.007-0.006,0.014-0.008,0.023-0.012
+  c0.025-0.011,0.037-0.038,0.06-0.053c0.01-0.007,0.014-0.005,0.02-0.016c0.005-0.009,0.014-0.02,0.017-0.029
+  c0.006-0.018-0.006-0.036-0.021-0.046c-0.016-0.013-0.038-0.013-0.033-0.04c0.002-0.011,0.009-0.021,0.011-0.032
+  c0.003-0.011,0.009-0.032,0.005-0.042c-0.021,0.007-0.03,0.041-0.037,0.059c-0.013,0.034-0.034,0.067-0.066,0.086
+  c-0.019,0.012-0.038,0.023-0.06,0.032c-0.012,0.004-0.012,0.005-0.017,0.017c-0.004,0.01-0.001,0.03-0.009,0.033
+  c-0.008,0.003-0.025,0-0.033,0h-0.033c-0.01,0-0.023,0.002-0.033,0s-0.022-0.009-0.032-0.012c-0.015-0.005-0.029-0.013-0.044-0.016
+  c-0.01-0.001-0.022,0.001-0.033,0.001c-0.01,0-0.022-0.002-0.032,0.001c-0.007,0.001-0.009,0.005-0.017,0.004
+  c-0.008,0-0.009-0.004-0.016-0.006c-0.01-0.002-0.022,0.002-0.033,0.001c-0.017-0.003-0.007-0.008-0.01-0.022
+  c-0.001-0.003-0.004-0.01-0.006-0.011c-0.006-0.007-0.002-0.002-0.011-0.005c-0.011-0.005-0.02-0.007-0.033-0.002
+  c-0.009,0.004-0.018,0.007-0.027,0.012c-0.009,0.005-0.017,0.013-0.026,0.018c-0.005,0.003-0.012,0.003-0.016,0.005
+  c-0.003,0.002-0.005,0.006-0.008,0.009c-0.011,0.008-0.023,0.012-0.037,0.012c-0.016,0-0.049,0.006-0.064-0.001
+  c-0.021-0.011-0.008-0.04-0.012-0.059c-0.001-0.006-0.004-0.01-0.006-0.016c-0.001-0.005,0.001-0.011,0.001-0.017
+  c-0.001-0.01-0.006-0.015-0.006-0.027c0-0.021-0.011-0.041-0.016-0.059c-0.008-0.025-0.017-0.048-0.038-0.066
+  c-0.014-0.011-0.031-0.034-0.049-0.038c-0.005-0.002-0.011,0.001-0.016-0.001c-0.006-0.002-0.012-0.006-0.017-0.009
+  c-0.009-0.004-0.019-0.007-0.028-0.01c-0.011-0.004-0.02-0.007-0.032-0.007c-0.013,0-0.026,0.002-0.038-0.004
+  c-0.036-0.017-0.003-0.039,0.012-0.056c0.017-0.018,0.031-0.037,0.048-0.053c0.019-0.019,0.043-0.023,0.066-0.034
+  c0.019-0.01,0.032-0.027,0.05-0.037c0.019-0.011,0.036-0.025,0.051-0.041c0.008-0.008,0.016-0.017,0.022-0.026
+  c0.003-0.003,0.01-0.012,0.012-0.016c0.002-0.007,0-0.014,0.002-0.022c0.002-0.009,0.008-0.018,0.01-0.027
+  c0.002-0.012-0.002-0.016,0.006-0.027c0.014-0.019,0.043-0.032,0.064-0.042c0.022-0.011,0.041-0.028,0.051-0.051
+  c0.002-0.006,0.002-0.01,0.003-0.016c0.002-0.005,0.005-0.006,0.006-0.011c0.003-0.013-0.002-0.02,0.006-0.032
+  c0.011-0.014,0.024-0.019,0.038-0.029c0.01-0.008,0.019-0.016,0.028-0.025c0.008-0.006,0.013-0.012,0.022-0.017
+  c0.015-0.009,0.03-0.009,0.046-0.015c0.021-0.008,0.041-0.016,0.061-0.023c0.02-0.008,0.038-0.016,0.054-0.029
+  c0.01-0.007,0.02-0.013,0.029-0.02c0.01-0.008,0.02-0.016,0.031-0.021c0.017-0.007,0.055-0.009,0.055-0.034
+  c0-0.024-0.032-0.026-0.049-0.023c-0.023,0.005-0.048-0.003-0.071,0.003c-0.011,0.002-0.02,0.006-0.033,0.004
+  c-0.011-0.001-0.02-0.008-0.032-0.006c-0.006,0.001-0.011,0.005-0.016,0.007c-0.007,0.003-0.011,0.003-0.017,0.004
+  c-0.005,0.001-0.006,0.007-0.011,0.005c-0.003-0.001-0.008-0.009-0.01-0.012c0.003-0.005,0.008-0.015,0.009-0.021
+  c0.002-0.011-0.001-0.015-0.005-0.025c-0.005-0.01-0.002-0.017-0.004-0.028c-0.003-0.014-0.012-0.024-0.016-0.037
+  c-0.005-0.022,0.003-0.04,0.006-0.06c0.001-0.007,0.005-0.003,0.003-0.012c-0.001-0.007-0.006-0.007-0.01-0.012
+  c-0.009-0.011-0.014-0.022-0.018-0.036c0-0.002-0.003-0.009-0.004-0.012c-0.001-0.006-0.001-0.007-0.003-0.012
+  c-0.006-0.011-0.012-0.014-0.003-0.026c0.008-0.01,0.018-0.012,0.027-0.018c0.013-0.008,0.024-0.021,0.036-0.031
+  c0.015-0.015,0.034-0.027,0.048-0.043c0.02-0.024,0.042-0.05,0.068-0.066c0.018-0.011,0.034-0.02,0.051-0.031
+  c0.019-0.014,0.025-0.041,0.044-0.055c0.009-0.006,0.024-0.004,0.032-0.01c0.006-0.005,0.01-0.013,0.015-0.019
+  c0.018-0.022,0.038-0.043,0.057-0.063c0.007-0.008,0.014-0.016,0.02-0.024c0.009-0.012,0.021-0.021,0.029-0.032
+  c0.012-0.016,0.02-0.036,0.025-0.056c0.002-0.013,0.002-0.023,0.006-0.037c0.004-0.009,0.004-0.012,0.012-0.02
+  c0.006-0.005,0.011-0.011,0.016-0.017c0.016-0.017,0.037-0.028,0.052-0.044c0.01-0.01,0.02-0.018,0.03-0.028
+  c0.023-0.024,0.05-0.041,0.074-0.062c0.01-0.008,0.019-0.015,0.029-0.023c0.004-0.003,0.006-0.008,0.01-0.011
+  c0.007-0.005,0.015-0.007,0.022-0.012c0.024-0.018,0.048-0.035,0.071-0.053c0.019-0.015,0.037-0.027,0.06-0.036
+  c0.011-0.004,0.02-0.002,0.031-0.005c0.014-0.004,0.014-0.015,0.023,0.002c0.01,0.018,0.024,0.036,0.045,0.042
+  c0.01,0.003,0.02,0.002,0.031,0.006c0.014,0.006,0.024,0.006,0.038,0.006s0.025-0.005,0.039-0.006c0.005,0,0.011,0.001,0.016,0.001
+  c0.008-0.002,0.011-0.01,0.021-0.005c-0.003,0.009-0.015,0.01-0.022,0.016c-0.008,0.009-0.014,0.021-0.022,0.031
+  c-0.01,0.011-0.016,0.022-0.028,0.032c-0.013,0.011-0.027,0.013-0.026,0.034c0.001,0.01,0.004,0.021,0.013,0.026
+  c0.004,0.003,0.024,0.007,0.029,0.007c-0.007,0.004-0.012,0.012-0.008,0.021c0.006,0.01,0.023,0.006,0.033,0.006
+  c0.02,0,0.036-0.007,0.053-0.015c0.008-0.004,0.01-0.002,0.018-0.008c0.009-0.007,0.015-0.01,0.025-0.013
+  c0.018-0.006,0.036-0.014,0.054-0.017c0.016-0.003,0.034-0.001,0.05-0.001c0.014,0,0.031-0.004,0.044-0.001
+  c0.01,0.003,0.021,0.005,0.029,0.006c0.009-0.007,0.013-0.004,0.021,0.001c0.012,0.008,0.006,0.015,0.015,0.022
+  c0.016,0.014,0.034,0.001,0.045-0.011c0.008-0.008,0.016-0.017,0.026-0.023c0.016-0.01,0.036-0.003,0.054-0.009
+  c0.02-0.007,0.026-0.027,0.049-0.029c0.011-0.001,0.017,0.004,0.027,0.006c0.028,0.006,0.059-0.005,0.087-0.01
+  c0.024-0.004,0.049-0.008,0.072-0.019c0.018-0.009,0.034-0.016,0.054-0.022c0.022-0.007,0.025-0.001,0.041,0.012
+  c-0.007,0.011-0.02,0.004-0.03,0.006c-0.015,0.002-0.03,0.01-0.043,0.018c-0.011,0.007-0.021,0.009-0.034,0.013
+  c-0.014,0.005-0.027,0.012-0.041,0.018c0.011,0,0.024,0.002,0.035,0c0.018-0.003,0.038-0.01,0.056-0.015
+  c0.01-0.003,0.02-0.005,0.031-0.008c0.004-0.001,0.006-0.004,0.012-0.004c0.008-0.002,0.014-0.002,0.022-0.005
+  c0.012-0.003,0.025,0.001,0.038-0.002c0.013-0.003,0.024-0.004,0.038-0.004c0.011,0,0.022,0.001,0.033-0.001
+  c0.013-0.003,0.025-0.005,0.038-0.005c0.007,0,0.022,0.004,0.025-0.005c-0.003-0.011-0.016-0.013-0.025-0.011
+  c-0.006,0.001-0.011,0.006-0.017,0.006c-0.004,0-0.007-0.005-0.01-0.006c-0.008-0.003-0.021-0.002-0.016-0.015
+  c0.002-0.006,0.018-0.013,0.023-0.016c0.007-0.003,0.023-0.013,0.031-0.013c0.005,0,0.005,0.005,0.01,0.006s0.012,0,0.017,0
+  c0.015,0,0.033-0.002,0.047-0.007c0.007-0.002,0.012-0.006,0.017-0.008c0.009-0.004,0.019,0,0.028-0.002
+  c-0.001-0.007-0.012-0.014-0.017-0.019c0.023,0.018,0.06-0.013,0.072-0.029c0.009-0.014,0.017-0.019,0.032-0.026
+  c0.014-0.007,0.026-0.009,0.04-0.017c0.003-0.002,0.011-0.006,0.014-0.007c0.004,0.001,0.008,0.001,0.012,0.001
+  c0.003,0,0.005-0.002,0.006-0.005c0.007-0.001,0.014,0.001,0.021,0c0.012-0.003,0.008-0.008,0.011-0.017
+  c0.005-0.027,0.031-0.045,0.047-0.065c0.019-0.024,0.044-0.046,0.074-0.054c0.006-0.001,0.013-0.001,0.02-0.001
+  c0.008,0,0.012-0.003,0.018-0.004c0.006-0.002,0.013-0.001,0.019-0.002c0.006-0.002,0.011-0.009,0.017-0.01
+  c0.007-0.002,0.014,0.001,0.021-0.001c0.004-0.002,0.014-0.009,0.017-0.011c0.006-0.006,0.012-0.027,0.022-0.027
+  c0.006,0,0.008,0.007,0.012,0.01c0.004,0.003,0.011,0.005,0.016,0.007c0.011,0.006,0.024,0.01,0.037,0.012
+  c0,0.008,0.006,0.013,0.006,0.02c0.002,0.011,0.001,0.018,0.006,0.028c0,0.003,0.001,0.005,0.004,0.007
+  c0.001,0.004-0.001,0.01,0.002,0.014c0.003,0.004,0.017,0.011,0.022,0.016c0.006,0.005,0.014,0.006,0.019,0.013
+  c0.001,0.003,0.002,0.006,0.003,0.009c0.002,0.003,0.006,0.004,0.008,0.007c0.005,0.006,0.004,0.015,0.007,0.021
+  c0.005,0.013,0.011,0.011,0.025,0.011c-0.001,0.013,0.039,0.002,0.046,0c0.009-0.004,0.018-0.004,0.027-0.011
+  c0.012-0.008,0.019-0.022,0.033-0.029c0.02-0.01,0.044-0.002,0.065,0.002s0.03-0.022,0.053-0.015
+  c0.007,0.002,0.015,0.007,0.018,0.014c0.002,0.007-0.001,0.016,0.001,0.023c0.002,0.006,0.004,0.009,0.004,0.016
+  c0,0.023-0.016,0.038-0.005,0.06c0.005,0.012,0.005,0.014-0.002,0.027c-0.006,0.011-0.009,0.014-0.009,0.027
+  s0.003,0.021,0.005,0.033c0.002,0.006,0.002,0.023-0.003,0.028c0.013,0.001,0.026-0.023,0.029-0.034
+  c0.005-0.016,0.013-0.037,0.012-0.054c0-0.017,0.007-0.03,0.018-0.042c0.004-0.005,0.01-0.009,0.014-0.014
+  c0-0.003,0.001-0.005,0.002-0.008c0.002-0.002,0.012-0.004,0.015-0.005c0.007-0.003,0.01-0.006,0.015-0.009
+  c0.008-0.004,0.014-0.003,0.023-0.003c0.012-0.001,0.02-0.001,0.028,0.01c0.003,0.005,0.01,0.016,0.011,0.022
+  c0.002,0.009-0.005,0.018-0.006,0.027c-0.001,0.009,0,0.018,0,0.028c0,0.021-0.005,0.047-0.015,0.066
+  c-0.008,0.015-0.015,0.026-0.019,0.042c-0.002,0.011-0.006,0.016-0.003,0.027c0.003,0.01,0.003,0.018,0.004,0.028
+  c0.001,0.007,0.004,0.009,0.006,0.016c0.002,0.008,0,0.019,0,0.027c0.001,0.022,0.011,0.034,0.027,0.048
+  c0.013,0.011,0.026,0.022,0.038,0.033c0.007,0.005,0.011,0.01,0.016,0.017c0.006,0.008,0.008,0.014,0.012,0.022
+  c0.008,0.012,0.025,0.021,0.031,0.034c0.005,0.01-0.003,0.012-0.005,0.02c-0.002,0.008-0.001,0.013-0.004,0.021
+  c0.006,0.004,0.017,0.021,0.016,0.029c-0.001,0.006-0.007,0.006-0.012,0.01c-0.004,0.004-0.007,0.011-0.01,0.017
+  c-0.012,0.019-0.024,0.043-0.045,0.053c-0.005,0.002-0.011,0.001-0.016,0.005c-0.005,0.004-0.002,0.006-0.006,0.011
+  c-0.007,0.01-0.01,0.015-0.01,0.028c0.001,0.012,0.007,0.018,0.011,0.027c0.006,0.012,0.005,0.024,0.01,0.035
+  c0.008,0.017,0.024,0.032,0.019,0.053c-0.002,0.01-0.013,0.02-0.006,0.031c0.007,0.01,0.022,0.008,0.032,0.006
+  c0.012-0.003,0.022-0.01,0.032-0.017c0.011-0.008,0.021-0.01,0.033-0.015c0.025-0.009,0.051-0.011,0.076-0.017
+  c0.025-0.006,0.047-0.015,0.071-0.022c0.026-0.008,0.044-0.026,0.064-0.044c0.006-0.005,0.019-0.011,0.022-0.016
+  c0.004-0.005,0.002-0.025,0-0.03c-0.003-0.01-0.014-0.017-0.016-0.029c-0.001-0.013,0.012-0.018,0.022-0.023
+  c0.013-0.006,0.018-0.002,0.029,0c0.009,0.002,0.022,0.003,0.032,0.002c0.009-0.001,0.014-0.006,0.023-0.01
+  c0.011-0.006,0.018-0.012,0.02,0.004c0.002,0.015-0.002,0.021-0.01,0.033c-0.006,0.009-0.006,0.018-0.013,0.026
+  c-0.016,0.018-0.025,0.025-0.015,0.05c0.003,0.009,0.003,0.03,0.01,0.033c0.014,0.006,0.035-0.004,0.045-0.012
+  c0.017-0.015,0.024-0.052,0.048-0.059c0.005-0.002,0.011,0.001,0.017,0c0.008-0.001,0.011-0.006,0.017-0.01
+  c0.005-0.002,0.011-0.004,0.015-0.006c0.005-0.003,0.008-0.007,0.012-0.01c0.006-0.004,0.014-0.003,0.02-0.008
+  c0.004-0.003,0.007-0.007,0.01-0.011c0.008-0.008,0.019-0.013,0.027-0.02c-0.006,0.01-0.004,0.021-0.01,0.032
+  C-20.058,57.907-20.066,57.918-20.079,57.926z M-20.496,56.942c-0.016,0.005-0.024,0.014-0.022,0.033l-0.011-0.017
+  c-0.018,0.024-0.04-0.035-0.048-0.043c-0.006-0.005-0.01-0.004-0.012-0.011c-0.002-0.007,0.001-0.013,0.004-0.018
+  c0.008-0.011,0.022-0.015,0.034-0.019c0.03-0.009,0.049-0.033,0.077-0.045c0.011-0.005,0.025-0.008,0.037-0.011
+  c0.006,0.001,0.01,0.001,0.015-0.001c0.007-0.003,0.014-0.006,0.021-0.009c0.01-0.002,0.019-0.004,0.029-0.008
+  c0.012-0.004,0.023-0.004,0.034,0.007c0.014,0.014,0.011,0.028,0.005,0.044c-0.01,0.026-0.034,0.038-0.056,0.053
+  c-0.008,0.005-0.016,0.013-0.025,0.018c-0.013,0.006-0.03,0.01-0.044,0.015C-20.471,56.934-20.484,56.938-20.496,56.942z
+  M-20.562,57.008c0.01,0.008,0.021,0.015,0.033,0.021c0.015,0.007,0.025,0.007,0.034,0.022c0.015,0.022,0.011,0.039,0,0.061
+  c-0.003,0.006-0.004,0.013-0.008,0.019c-0.005,0.009-0.014,0.015-0.02,0.023c-0.008,0.014-0.006,0.029-0.018,0.042
+  c-0.016,0.018-0.038,0.034-0.064,0.028c-0.019-0.005-0.028-0.016-0.042-0.028c-0.007-0.005-0.016-0.01-0.022-0.016
+  c-0.002-0.002-0.004-0.004-0.005-0.006c-0.005-0.002-0.009-0.001-0.013-0.003c-0.008-0.004-0.035-0.013-0.038-0.024v0.013
+  c-0.005-0.017-0.059-0.055-0.053-0.07c0.002-0.002,0.004-0.003,0.006-0.005c0.002-0.004,0.003-0.008,0.005-0.011
+  c0.005-0.008,0.008-0.014,0.011-0.023c0.003-0.009,0.006-0.017,0.004-0.027c-0.002-0.012-0.008-0.019-0.004-0.032
+  c0.007-0.023,0.026-0.02,0.045-0.024c0.011-0.002,0.018-0.005,0.03-0.004c0.012,0,0.021-0.007,0.033-0.006
+  c0.015,0.001,0.025,0.015,0.037,0.023c0.009,0.006,0.018,0.007,0.027,0.011C-20.577,56.996-20.569,57.003-20.562,57.008z
+  M-20.741,57.17c0.003,0.011,0.002,0.033-0.001,0.043c-0.021,0.002-0.04,0.018-0.063,0.011l-0.001-0.005l-0.006-0.005
+  c0.001,0.004,0.001,0.007-0.001,0.01c-0.007-0.001-0.018-0.015-0.026-0.019c-0.008-0.005-0.013-0.007-0.022-0.007
+  c-0.003,0-0.007,0-0.011,0c-0.005,0-0.008,0.003-0.012,0.004c-0.007,0.001-0.013,0.001-0.02,0.001c-0.012,0-0.012-0.001-0.021-0.007
+  c-0.011-0.007-0.022-0.014-0.033-0.021c0-0.023,0.06-0.031,0.075-0.032c0.005,0,0.012-0.001,0.017,0
+  c0.007,0.002,0.008,0.007,0.016,0.006c0.004,0,0.007-0.004,0.011-0.006c0.005-0.002,0.011-0.003,0.016-0.005
+  c0.013-0.006,0.024-0.012,0.037-0.01c0.01,0.002,0.019,0.009,0.028,0.015C-20.748,57.15-20.743,57.159-20.741,57.17z
+  M-24.165,56.011c-0.325-0.11-1.03,0.279-0.976-0.33c0.055-0.609,0.057-0.298,0.086-0.447c0.107-0.033,0.215-0.065,0.322-0.098
+  c-0.002-0.002-0.005-0.003-0.007-0.007c-0.002-0.006,0-0.011-0.001-0.018c-0.001-0.007-0.003-0.013-0.003-0.021
+  c0-0.011,0.004-0.022,0.005-0.033c0.001-0.006-0.001-0.009-0.003-0.013c-0.001-0.006,0.001-0.013,0.002-0.018
+  c0.002-0.005,0.003-0.011,0.004-0.016c0-0.005-0.001-0.01,0-0.015c0-0.006,0.005-0.01,0.007-0.015
+  c0.002-0.007,0.002-0.012,0.003-0.019c0.001-0.009,0.008-0.014,0.012-0.023c0.003-0.004,0.004-0.012,0.008-0.015
+  c0.003-0.003,0.005-0.002,0.008-0.003c0.004-0.002,0.007-0.007,0.01-0.01c0.003-0.003,0.004-0.008,0.007-0.011
+  c0.004-0.003,0.008-0.004,0.012-0.006c0.01-0.006,0.015-0.019,0.025-0.023c0.013-0.006,0.025-0.015,0.036-0.024
+  c0.006-0.005,0.011-0.009,0.018-0.013c0.005-0.002,0.006-0.002,0.01-0.002c0.006-0.001,0.01-0.005,0.015-0.008
+  c0.003-0.001,0.007-0.003,0.01-0.005c0.003-0.001,0.006-0.004,0.009-0.005s0.005,0,0.008,0c0.004-0.001,0.007-0.002,0.01-0.003
+  c0.005-0.001,0.007,0,0.012-0.002c0.002-0.002,0.005-0.005,0.008-0.006c0.002-0.002,0.003-0.004,0.005-0.005
+  c0.005-0.003,0.006-0.002,0.011-0.002c0.005-0.001,0.013-0.005,0.018-0.008c0.007-0.004,0.014-0.009,0.02-0.013
+  c0.005-0.003,0.01-0.006,0.016-0.008c0.005-0.002,0.012-0.002,0.018-0.005c0.005-0.004,0.012-0.007,0.018-0.011
+  c0.005-0.003,0.008-0.006,0.015-0.007c0.012-0.001,0.028-0.002,0.039,0.003c0.006,0.004,0.009,0.006,0.012,0.013
+  c0.002,0.004,0.004,0.006,0.006,0.01c0.002,0.003,0.001,0.005,0.002,0.008c0.001,0.002,0.002,0.002,0.003,0.005
+  c0.001,0.005-0.001,0.012-0.001,0.018c0.001,0.005-0.002,0.008-0.002,0.013c0,0.006,0.005,0.008,0.01,0.009
+  c0.007,0.002,0.011,0.005,0.014,0.011c0.001,0.003,0.001,0.005,0.002,0.008c0,0.003,0.004,0.007,0.004,0.01
+  c0.001,0.004-0.002,0.008-0.002,0.013c0,0.005,0,0.008,0.003,0.013c0.005,0.01,0.013,0.018,0.022,0.026
+  c0.003,0.002,0.002,0.004,0.006,0.005c0.004,0,0.006-0.001,0.008-0.003c0.007-0.006,0.011-0.018,0.012-0.026
+  c0.001-0.006-0.004-0.014-0.007-0.019c-0.004-0.008-0.009-0.016-0.014-0.024c-0.005-0.008-0.013-0.016-0.014-0.026
+  c-0.001-0.01,0.008-0.019,0.01-0.028c0.001-0.007-0.001-0.012,0.008-0.013c0.005-0.001,0.01,0.001,0.015-0.001
+  c0.005-0.001,0.009-0.004,0.013-0.006c0.004-0.003,0.007-0.007,0.011-0.011c0.003,0.003,0.008,0.004,0.012,0.005
+  c0.005,0.002,0.01,0.005,0.016,0.006c0.008,0.002,0.015,0,0.023-0.003c0.007-0.002,0.01-0.005,0.018-0.005
+  c0.017,0,0.033,0,0.049-0.008c0.013-0.007,0.026-0.008,0.04-0.008c0.007,0,0.012-0.003,0.018-0.005
+  c0.006-0.001,0.01-0.001,0.016-0.003c0.005-0.002,0.009-0.005,0.015-0.005c0.007,0,0.014,0,0.021,0c0.005,0,0.012,0.002,0.018,0
+  c0.004-0.001,0.009-0.004,0.013-0.004c0.008-0.002,0.024,0,0.03,0.007c0.001,0.002,0,0.005,0,0.008c0,0.002,0.002,0.003,0.002,0.005
+  c0.001,0.005,0.001,0.01,0.001,0.015s0.001,0.01-0.001,0.015c0,0.003-0.002,0.006-0.002,0.008c-0.002,0.004-0.001,0.007-0.002,0.011
+  c-0.001,0.004-0.006,0.006-0.006,0.012c0,0.006,0.004,0.011,0.008,0.014c0.01,0.007,0.021,0.008,0.031,0.012
+  c0.009,0.003,0.021,0.004,0.031,0.003c0.021-0.002,0.017-0.023,0.03-0.032c0.008-0.006,0.019-0.007,0.027-0.012
+  c0.004-0.003,0.009-0.007,0.012-0.011c0.004-0.006,0.005-0.01,0.012-0.009c0.001,0.001,0.002,0.002,0.004,0.002
+  c0.003,0,0.003-0.001,0.005-0.002c0.005-0.002,0.009-0.005,0.013-0.008c0.004-0.004,0.005-0.009,0.01-0.013
+  c0.005-0.004,0.007-0.002,0.013-0.003c0.011-0.002,0.019-0.01,0.031-0.01c0.003,0,0.01,0.001,0.007-0.005
+  c-0.001-0.001-0.006-0.004-0.007-0.005c-0.003-0.003-0.005-0.005-0.008-0.006c0.001-0.006,0.008-0.004,0.012-0.004
+  c0.008-0.002,0.014-0.003,0.021-0.003c0.012,0,0.027,0.002,0.039,0c0.011-0.002,0.02-0.014,0.025-0.023
+  c0.003-0.005,0.004-0.009,0.009-0.013s0.011-0.005,0.017-0.005c0.01,0,0.018,0.004,0.028,0.005c0.005,0,0.009,0.002,0.014,0.004
+  c0.006,0.004,0.01,0.003,0.017,0.003c0.005,0.001,0.003,0,0.005,0.003c0.001,0.001,0.003,0.006,0.004,0.008
+  c0.003,0.006,0.006,0.012,0.007,0.018c0.002,0.008,0.001,0.016,0.002,0.024c0.001,0.007,0.003,0.012,0.003,0.02
+  c0,0.004-0.001,0.01,0,0.014c0,0.001,0.001,0.001,0.001,0.002c0.099-0.03-0.143,0.256,0.297-0.09s0.336,0.817-0.066,1.025
+  C-23.693,55.914-23.874,55.909-24.165,56.011z M-24.181,56.017c0.005-0.002,0.011-0.004,0.016-0.006
+  c0.017,0.006,0.034,0.012,0.051,0.018L-24.181,56.017z M-24.607,55.943l0.426,0.074c-0.05,0.017-0.099,0.035-0.148,0.052
+  C-24.422,56.027-24.515,55.985-24.607,55.943z M-33.449,52.473c0.015,0.018,0.025,0.032,0.022,0.057
+  c-0.003,0.021-0.001,0.046-0.026,0.05c-0.001-0.002-0.003-0.003-0.006-0.003h-0.005c-0.002-0.02-0.023-0.04-0.026-0.063
+  c-0.002-0.014,0.012-0.061,0.033-0.037C-33.455,52.475-33.452,52.475-33.449,52.473z M-27.922,53.12L-27.922,53.12L-27.922,53.12
+  L-27.922,53.12z M-25.706,56.522c-0.279,0.349-0.558,0.698-0.837,1.047c-0.001,0.012,0.003,0.025-0.001,0.036
+  c-0.004,0.013-0.015,0.02-0.02,0.032c-0.01,0.022-0.003,0.045-0.005,0.068c-0.003,0.021-0.017,0.037-0.022,0.058
+  c-0.007,0.022-0.001,0.045-0.004,0.068c-0.002,0.011-0.009,0.02-0.011,0.031c-0.002,0.012,0.001,0.025,0,0.037
+  c-0.002,0.019-0.012,0.037-0.015,0.058c-0.002,0.022,0.005,0.042,0.01,0.063c0.006,0.027,0.006,0.093,0.041,0.1
+  c0.004,0.025,0.002,0.056-0.031,0.057c-0.012,0.001-0.021-0.008-0.035-0.004c-0.014,0.003-0.024,0.019-0.038,0.02
+  c-0.024,0.002-0.036-0.029-0.058-0.027c-0.003,0-0.002,0.003-0.003,0.003c-0.019,0.067-0.038,0.134-0.057,0.201
+  c0.006,0.01,0.013,0.019,0.014,0.026c0.004,0.015-0.002,0.032-0.017,0.044c-0.005,0.005-0.012-0.001-0.017,0.002
+  c-0.092,0.323-0.183,0.646-0.274,0.969c0.091,0.148,0.182,0.296,0.274,0.444c-0.291-0.117-0.581-0.234-0.872-0.352
+  c0.122,0.03,0.231,0.045,0.318,0.038l-1.097-0.379c0,0.006-0.007,0.011-0.004,0.022c0,0.001,0.001,0.003,0.002,0.004
+  c0.26,0.105,0.521,0.21,0.781,0.315c-0.216-0.052-0.483-0.162-0.78-0.312c0.002,0.006,0.004,0.014,0.007,0.019
+  c0.008,0.01,0.009,0.005,0.02,0.011c0.018,0.01,0.024,0.026,0.038,0.04c0.028,0.03,0.071,0.05,0.105,0.068
+  c0.035,0.019,0.074,0.04,0.111,0.053c0.02,0.006,0.043,0.012,0.062,0.016c0.016,0.004,0.037,0.006,0.052,0.012
+  c0.021,0.009,0.039,0.025,0.059,0.034c0.018,0.009,0.029,0.022,0.046,0.032c0.018,0.01,0.04,0.019,0.059,0.026
+  c0.026,0.011,0.024,0.011,0.039,0.037c0.014,0.024,0.041,0.018,0.065,0.027c0.024,0.01,0.041,0.034,0.058,0.053
+  c0.022,0.026,0.06,0.041,0.094,0.052c0.018,0.006,0.036,0.008,0.053,0.015c0.019,0.007,0.037,0.02,0.052,0.033
+  c0.016,0.015,0.027,0.03,0.047,0.041c0.019,0.011,0.033,0.017,0.048,0.032c0.011,0.01,0.026,0.027,0.039,0.033
+  c0.016,0.006,0.037,0.009,0.054,0.014c0.022,0.006,0.045,0.001,0.067,0.006c0.008,0.002,0.019,0.007,0.028,0.009
+  c0.011,0.003,0.02,0.004,0.031,0.006c0.022,0.003,0.041,0.007,0.063,0.01c0.014,0.002,0.04,0.013,0.036,0.031
+  c-0.022-0.001-0.039,0.007-0.062,0.002c-0.019-0.004-0.036-0.005-0.057-0.008c-0.016-0.001-0.037-0.005-0.053-0.009
+  c-0.021-0.004-0.043-0.002-0.063-0.006c-0.019-0.005-0.034-0.016-0.053-0.02c-0.025-0.006-0.051-0.002-0.076-0.012
+  c-0.017-0.007-0.033-0.021-0.049-0.025c-0.018-0.004-0.04,0.002-0.058,0c-0.042-0.003-0.08-0.034-0.121-0.047
+  c-0.019-0.006-0.035-0.012-0.053-0.012c-0.02,0.001-0.037,0.004-0.053-0.008c-0.006-0.004-0.01-0.011-0.015-0.016
+  c-0.019-0.019-0.029-0.02-0.055-0.023c-0.019-0.002-0.045,0-0.064-0.005c-0.016-0.005-0.034-0.015-0.05-0.021
+  c-0.011-0.003-0.024-0.013-0.034-0.015c-0.008-0.002-0.019,0.004-0.026-0.001c-0.026-0.015-0.012-0.051-0.048-0.057
+  c-0.031-0.004-0.031-0.006-0.051-0.031c-0.025-0.03-0.056-0.057-0.091-0.074c-0.024-0.012-0.049-0.022-0.073-0.035
+  c-0.009-0.004-0.016-0.013-0.026-0.016c-0.011-0.002-0.022,0.002-0.032-0.002c-0.013-0.004-0.022-0.012-0.035-0.016
+  c-0.008-0.001-0.017-0.004-0.024-0.007c-0.01-0.005-0.014-0.01-0.025-0.012c-0.011-0.003-0.019-0.003-0.031-0.007
+  c-0.046-0.017-0.088-0.037-0.136-0.047c-0.032-0.006-0.06-0.024-0.09-0.034c-0.019-0.007-0.03-0.006-0.047-0.018
+  c-0.019-0.014-0.036-0.026-0.052-0.041c-0.017-0.017-0.039-0.023-0.058-0.037s-0.029-0.038-0.046-0.056
+  c-0.019-0.021-0.044-0.041-0.069-0.054c-0.029-0.016-0.058-0.041-0.089-0.051c-0.031-0.01-0.052-0.018-0.079-0.033
+  c-0.031-0.017-0.065-0.026-0.096-0.043c-0.013-0.008-0.027-0.013-0.04-0.021c-0.013-0.008-0.018-0.016-0.028-0.025
+  c-0.019-0.018-0.041-0.033-0.06-0.052c-0.019-0.019-0.043-0.015-0.065-0.031c-0.013-0.009-0.016-0.029-0.027-0.037
+  c-0.005-0.004-0.023-0.004-0.03-0.006c-0.02-0.006-0.035-0.01-0.041-0.031c-0.006-0.021-0.007-0.043-0.011-0.063
+  c-0.004-0.019,0-0.032,0.005-0.053c0.006-0.029,0.005-0.038-0.01-0.062c-0.012-0.021-0.01-0.029-0.038-0.032
+  c-0.028-0.003-0.03,0.016-0.053,0.025c-0.018,0.008-0.051,0.003-0.057-0.014c-0.004-0.012,0.005-0.023-0.003-0.033
+  c-0.006-0.008-0.019-0.011-0.027-0.016c-0.013-0.009-0.021-0.035-0.037-0.036c-0.002-0.013-0.002-0.021-0.005-0.03
+  c-0.021-0.006-0.049-0.03-0.066-0.043c-0.044-0.033-0.081-0.077-0.119-0.115c-0.017-0.017-0.032-0.033-0.048-0.052
+  c-0.012-0.015-0.028-0.02-0.042-0.032c-0.034-0.028-0.047-0.063-0.068-0.1c-0.012-0.021-0.04-0.029-0.05-0.051
+  c-0.001-0.002,0-0.004-0.001-0.007c-0.446-0.335-0.894-0.711-1.316-1.103c0.004,0.013,0.005,0.026,0.012,0.039
+  c0.005,0.008,0.01,0.012,0.014,0.021c0.007,0.017,0.009,0.036,0.016,0.053c0.018,0.046,0.042,0.088,0.053,0.136
+  c0.007,0.026,0.015,0.047,0.029,0.069c0.009,0.012,0.033,0.059,0.028,0.067l-0.011-0.005c-0.024-0.008-0.045-0.037-0.067-0.052
+  c-0.018-0.011-0.025-0.06-0.037-0.085c-0.013-0.027-0.034-0.048-0.05-0.074c-0.014-0.021-0.023-0.052-0.055-0.052
+  c0.003-0.024-0.014-0.031-0.027-0.047c-0.012-0.016-0.023-0.031-0.036-0.046c-0.027-0.029-0.05-0.068-0.065-0.104
+  c-0.004-0.01,0-0.02-0.003-0.032c-0.003-0.01-0.011-0.017-0.016-0.027c-0.007-0.014-0.009-0.032-0.017-0.047
+  c-0.006-0.011-0.021-0.019-0.026-0.031c-0.004-0.013-0.001-0.019-0.008-0.032c-0.002-0.003-0.004-0.006-0.006-0.008
+  c-1.279-1.251-2.211-2.634-1.778-3.512c0.001-0.001,0.002-0.001,0.004-0.002c-0.003-0.011-0.007-0.023-0.011-0.037
+  c-0.017-0.067,0.002-0.076,0.068-0.074c0.017,0.021,0.042,0.044,0.046,0.072c0.086-0.033,0.173-0.067,0.259-0.1
+  c-0.061-0.188-0.123-0.376-0.184-0.564c-0.002-0.002-0.005-0.002-0.009-0.006c0.002,0.002-0.034-0.046-0.033-0.041
+  c-0.001-0.001-0.002-0.002-0.003-0.002c0.006-0.01,0.011-0.023,0.018-0.035c-0.015-0.046-0.03-0.092-0.045-0.138
+  c-0.008-0.005-0.018-0.008-0.042-0.015c-0.043-0.01-0.053-0.017-0.072-0.058c-0.048-0.106-0.079-0.23-0.112-0.343
+  c0.001,0.002,0.002,0.003,0.005,0.002c0.008-0.042-0.03-0.102-0.042-0.14c-0.015-0.053-0.027-0.105-0.042-0.158
+  c-0.019-0.062-0.091-0.233-0.022-0.289c-0.041-0.125-0.082-0.25-0.123-0.375c0.346-0.283,0.692-0.566,1.038-0.85
+  c-0.001-0.001-0.002-0.002-0.003-0.003c-0.003-0.005-0.003-0.008-0.004-0.013c-0.001-0.003-0.003-0.004-0.003-0.008
+  c0-0.003,0-0.006,0-0.008c0-0.003-0.002-0.006-0.003-0.008c-0.001-0.006,0.003-0.011,0.003-0.016c0-0.007-0.001-0.008-0.003-0.013
+  c-0.003-0.009-0.009-0.015-0.013-0.023c-0.004-0.008-0.004-0.019-0.008-0.029c-0.003-0.006-0.006-0.011-0.011-0.016
+  c-0.005-0.006-0.007-0.014-0.011-0.019c0.003-0.004,0.01-0.003,0.011-0.008c0-0.007-0.017-0.004-0.021-0.004
+  c-0.018,0-0.034,0.005-0.052,0.004c-0.014-0.001-0.026-0.008-0.039-0.011c-0.016-0.004-0.03,0.009-0.045,0.011
+  c-0.006,0.001-0.013-0.002-0.02,0.001c-0.008,0.003-0.009,0.008-0.019,0.007c-0.014-0.001-0.023-0.008-0.036,0
+  c-0.006,0.003-0.011,0.008-0.017,0.012c-0.01,0.006-0.021,0.008-0.031,0.013c-0.017,0.007-0.035,0.009-0.052,0.014
+  c-0.034,0.008-0.062,0.022-0.093,0.037c-0.014,0.007-0.032,0.009-0.048,0.014c-0.016,0.006-0.031,0.016-0.047,0.023
+  c-0.012,0.005-0.026,0.012-0.039,0.015c-0.004,0-0.008,0-0.012-0.001c-0.005,0.001-0.007,0.002-0.012,0.003
+  c-0.007,0.002-0.014,0.005-0.02,0.006c-0.013,0.002-0.029-0.005-0.04,0.002c-0.006,0.004-0.008,0.01-0.016,0.013
+  c-0.007,0.001-0.017,0.002-0.023,0c0-0.007-0.005-0.008-0.008-0.012c-0.004-0.004-0.004-0.006-0.005-0.011
+  c-0.002-0.009-0.005-0.017-0.004-0.026c-0.001-0.007-0.002-0.015,0-0.022c0.002-0.016,0.015-0.028,0.023-0.041
+  c0.007-0.012,0.006-0.026,0.014-0.038c0.005-0.009,0.006-0.017,0.01-0.026c0.003-0.005,0.01-0.01,0.012-0.015
+  c0.002-0.004,0-0.008,0.002-0.011c0.006-0.012,0.019-0.021,0.027-0.033c0.004-0.007,0.005-0.016,0.008-0.024
+  c0.002-0.006,0.004-0.013,0.004-0.02v-0.02c0-0.003,0.001-0.009,0-0.012c-0.001-0.003-0.004-0.004-0.005-0.008
+  c-0.003-0.014,0.007-0.032-0.004-0.044c-0.006-0.005-0.012-0.005-0.018-0.008c-0.008-0.004-0.014-0.01-0.021-0.015
+  c-0.014-0.007-0.023-0.005-0.036,0.003c-0.006,0.003-0.01,0.007-0.012-0.003c-0.002-0.007,0-0.017,0-0.024
+  c0-0.009-0.005-0.013-0.004-0.021c0-0.005,0.006-0.01,0.009-0.014c0.006-0.01,0.012-0.02,0.023-0.026
+  c0.011-0.007,0.019-0.015,0.025-0.027c0.003-0.007,0.006-0.014,0.01-0.02c0.001-0.003,0.003-0.006,0.005-0.01
+  c0.001-0.002,0.001-0.005,0.002-0.008c0.001-0.006,0.004-0.01,0.006-0.016c0.001-0.003,0.002-0.004,0.003-0.007
+  c0.001-0.006,0-0.013,0.008-0.014l0,0c0.005-0.008,0.011-0.015,0.016-0.023c0.001-0.002,0.002-0.004,0.004-0.006
+  c0.003-0.006,0.006-0.009,0.01-0.013c0.005-0.006,0.009-0.012,0.013-0.018c0.004-0.007,0.005-0.016,0.009-0.023
+  c0.004-0.008,0.012-0.014,0.015-0.024c0.006-0.02-0.003-0.035-0.023-0.023c-0.016,0.009-0.031,0.021-0.048,0.03
+  c-0.025,0.012-0.013-0.02-0.004-0.03c0.013-0.015,0.03-0.023,0.042-0.039c0.012-0.014,0.015-0.035,0.029-0.047
+  c0.012-0.01,0.033-0.022,0.047-0.024c0.021-0.004,0.035-0.013,0.053-0.023c0.01-0.006,0.027-0.012,0.038-0.015
+  c0.006-0.001,0.01,0,0.015-0.001c0.005,0,0.007-0.003,0.01-0.003c0.011-0.002,0.014-0.002,0.023-0.007
+  c0.01-0.006,0.019-0.012,0.029-0.017c0.018-0.012,0.04-0.021,0.052-0.04c0.005-0.006,0.007-0.016,0.014-0.02
+  c0.007-0.005,0.016-0.006,0.023-0.009c0.018-0.009,0.024-0.022,0.035-0.037c0.003-0.005,0.01-0.016,0.015-0.019
+  c0.013-0.005,0.015,0.009,0.013,0.018c-0.003,0.009-0.013,0.02-0.018,0.029c-0.006,0.01-0.01,0.019-0.015,0.029
+  c-0.006,0.015-0.011,0.028-0.02,0.043c-0.006,0.009-0.01,0.019-0.017,0.029c-0.005,0.007-0.01,0.011-0.014,0.019
+  c-0.003,0.006-0.011,0.017-0.011,0.024c-0.001,0.01,0.007,0.012,0.004,0.022c-0.002,0.008-0.01,0.017-0.018,0.02
+  c-0.005,0.001-0.009,0-0.015,0.001c-0.004,0-0.007,0.003-0.01,0.003c-0.008,0.002-0.017-0.001-0.022,0.007
+  c-0.003,0.005,0.001,0.018,0.005,0.022c0.003,0.003,0.008,0.003,0.012,0.007c0.003,0.003,0.005,0.004,0.006,0.008
+  c0.001,0.004-0.001,0.01,0,0.015c0.001,0.006,0.001,0.005,0.003,0.01c0.004,0.008,0.009,0.014,0.013,0.022
+  c0.002,0.005,0.003,0.004,0.003,0.011c0,0.006-0.003,0.006-0.004,0.01c-0.001,0.006-0.001,0.012,0,0.018
+  c0.005,0.002,0.01,0.003,0.016,0.003c0.009,0.001,0.019-0.002,0.028,0c0.008,0.002,0.01,0.006,0.02,0.003
+  c0.008-0.002,0.015-0.002,0.024-0.003c0.003,0,0.009-0.003,0.012-0.003c0.004,0,0.003,0.003,0.007,0.003
+  c0.008,0.002,0.014,0.001,0.021,0.007c0.01,0.009,0.001,0.033-0.001,0.045c-0.005,0.018-0.001,0.035,0.007,0.052
+  c0.013,0.026,0.064-0.008,0.072-0.025c0.002-0.004,0.001-0.005,0.005-0.008c0.003-0.003,0.008-0.001,0.011-0.004
+  c0.007-0.005,0.011-0.015,0.009-0.023c-0.001-0.009-0.022-0.045-0.001-0.045c0.001-0.005,0.004-0.009,0.006-0.014
+  c0.003-0.005,0.003-0.01,0.004-0.016c0.001-0.005,0.007-0.023,0.014-0.024c0.004,0.007,0.014-0.001,0.017-0.004
+  c0.005-0.005,0.007-0.019,0.016-0.017c0.009,0.002,0.011,0.017,0.013,0.023c0.001,0.006,0.004,0.006,0.002,0.013
+  c-0.001,0.006-0.002,0.011-0.004,0.016c-0.003,0.012-0.003,0.023-0.003,0.036c0,0.011,0.001,0.02-0.003,0.029
+  c-0.008,0.017-0.007,0.035,0.003,0.051c0.009,0.014,0.024,0.027,0.037,0.039c0.008,0.007,0.016,0.005,0.026,0.005
+  c0.016,0,0.034,0,0.048-0.009c0.015-0.01,0.028-0.021,0.044-0.028c0.019-0.008,0.049-0.011,0.066-0.03
+  c0.008,0.003,0.009,0.003,0.018,0c0.009-0.003,0.016-0.005,0.023-0.01c0.006-0.003,0.011-0.01,0.017-0.011
+  c0.004-0.001,0.009,0.001,0.012,0c0.005-0.001,0.007-0.003,0.012-0.004c0.008-0.001,0.016,0.001,0.023-0.001
+  c0.009-0.002,0.019-0.006,0.029-0.007c0.007,0,0.015-0.001,0.02,0.004c0.008,0.007,0.001,0.014,0.004,0.024
+  c0.004,0.015,0.022,0.018,0.013,0.036c-0.011,0.021-0.032,0.027-0.049,0.044c-0.014,0.013-0.026,0.028-0.039,0.041
+  c-0.011,0.011-0.025,0.017-0.036,0.028c-0.008,0.007-0.02,0.016-0.025,0.026c-0.003,0.008-0.003,0.013-0.009,0.019
+  c-0.006,0.007-0.013,0.009-0.019,0.017c-0.007,0.012-0.017,0.02-0.027,0.029c-0.008,0.007-0.014,0.013-0.021,0.02
+  c-0.004,0.005-0.009,0.007-0.013,0.011c-0.002,0.004-0.004,0.009-0.006,0.012c-0.009,0.012-0.02,0.02-0.031,0.029
+  c-0.005,0.004-0.011,0.009-0.014,0.014c-0.005,0.006-0.007,0.014-0.011,0.021c-0.005,0.007-0.002,0.012-0.004,0.02
+  c-0.002,0.007-0.009,0.013-0.011,0.02c-0.005,0.015-0.001,0.036-0.001,0.052c0,0.008-0.003,0.012-0.004,0.02
+  c-0.002,0.006,0.001,0.013,0,0.02c-0.001,0.006-0.003,0.009-0.004,0.015c-0.001,0.007,0,0.014,0,0.021
+  c-0.001,0.012-0.006,0.027-0.009,0.039c-0.001,0.005-0.001,0.009-0.002,0.013c0.08-0.066,0.159-0.131,0.239-0.196
+  c0.048,0.003,0.096,0.005,0.144,0.008c0.001-0.004,0-0.007,0.002-0.01c0.002-0.004,0.005-0.01,0.009-0.013
+  c0.004-0.004,0.01-0.003,0.014-0.009c0.008-0.011,0.004-0.027,0.005-0.04c0-0.018,0.014-0.018,0.028-0.025
+  c0.011-0.006,0.02-0.012,0.031-0.02c0.012-0.008,0.024-0.003,0.036-0.012c0.006-0.004,0.011-0.009,0.017-0.014
+  c0.005-0.004,0.008-0.004,0.015-0.006c0.009-0.002,0.009-0.003,0.016,0.001c0.006,0.004,0.008,0.004,0.007,0.011
+  c0,0.003-0.005,0.008-0.006,0.01c-0.002,0.006-0.005,0.013-0.005,0.019c0,0.012,0.003,0.027-0.003,0.037
+  c-0.006,0.011-0.021,0.016-0.029,0.026c-0.007,0.008-0.01,0.018-0.019,0.026c-0.002,0.002-0.006,0.005-0.008,0.008
+  c-0.002,0.003-0.002,0.011-0.005,0.014c-0.001,0.001-0.003,0.001-0.005,0.002c0.022,0.001,0.043,0.002,0.064,0.003
+  c0.002-0.006,0.006-0.013,0.008-0.018c0.008-0.024,0.023-0.032,0.045-0.045c0.022-0.012,0.043-0.01,0.067-0.021
+  c0.013-0.006,0.024-0.014,0.037-0.019c0.016-0.007,0.039-0.005,0.054-0.011c0.048-0.02,0.066-0.083,0.096-0.12
+  c0.018-0.021,0.03-0.027,0.055-0.019c0.012,0.004,0.021,0.013,0.032,0.016c0.021,0.007,0.044,0.005,0.064,0.011
+  c0.026,0.009,0.043,0.024,0.059,0.046c0.009,0.012,0.013,0.026,0.021,0.038c0.006,0.009,0.02,0.018,0.025,0.026
+  c0.01,0.017,0.007,0.045,0.005,0.066c-0.005,0.043,0.01,0.019,0.035,0.044c0.015,0.014,0.004,0.026-0.002,0.038
+  c0.293,0.016,0.586,0.031,0.879,0.047c0-0.008-0.001-0.017,0.001-0.024c0.004-0.014,0.016-0.024,0.019-0.037
+  c-0.001,0.006,0.001,0.011,0.001,0.016c0.02-0.01,0.041-0.019,0.062-0.026c0.02-0.008,0.043-0.037,0.059-0.037
+  c0.012,0,0.047,0.023,0.06,0.03c0.035,0.017,0.058,0.028,0.098,0.028l0,0c0.32-0.095,0.639-0.19,0.958-0.285
+  c0.003-0.004,0.006-0.008,0.01-0.012c0.019-0.019,0.042-0.016,0.061-0.031c0.016-0.013,0.016-0.038,0.023-0.056
+  c0.016-0.04,0.063-0.047,0.1-0.04c0.003,0.006,0.007,0.008,0.013,0.009c0.006-0.001,0.011-0.004,0.013-0.009
+  c0.01-0.003,0.014-0.004,0.022-0.01c0.009-0.007,0.027-0.023,0.029-0.034c0.005-0.022-0.051-0.075-0.003-0.083
+  c0.018,0.021,0.04,0.04,0.055,0.062c0.016,0.021,0.032,0.044,0.05,0.065c0.005,0.006,0.01,0.015,0.017,0.024
+  c0.129-0.039,0.258-0.077,0.387-0.116c0.024,0.045,0.047,0.09,0.07,0.135c-0.204,0.679-0.937,1.674-0.611,2.037
+  c0.325,0.363,0.981,0.295,1.472,0.442c0.069,0.151,0.138,0.302,0.207,0.454c-0.111,0.243-0.223,0.487-0.334,0.73
+  c0.051,0.247,0.101,0.495,0.152,0.742c0.02,0.015,0.036,0.036,0.042,0.045c0.021,0.033,0.016,0.069,0.028,0.103
+  c0.007,0.016,0.016,0.033,0.02,0.049c0.003,0.016-0.008,0.032-0.008,0.046c-0.001,0.012,0.019,0.024,0.027,0.035
+  c0.012,0.015,0.016,0.03,0.019,0.045c0.009,0.037,0.011,0.074,0,0.111c-0.006,0.022,0.009,0.04,0.008,0.062
+  c0,0.02-0.001,0.04,0,0.059c0.001,0.01,0.007,0.019,0.006,0.028c-0.001,0.009-0.011,0.018-0.018,0.027
+  c0.045,0.223,0.091,0.445,0.136,0.668c0.483,0.384,0.967,0.768,1.45,1.152c-0.011,0.005-0.021,0.011-0.032,0.016
+  c0.032,0.006,0.083,0.008,0.097,0.036c-0.026,0.011-0.052,0.025-0.078,0.032c-0.021,0.005-0.039,0.021-0.059,0.025
+  c-0.022,0.006-0.046,0.005-0.067,0.013c-0.002,0.001-0.004,0.002-0.006,0.003c0.041,0.054,0.082,0.109,0.124,0.164
+  c0.047-0.014,0.094-0.027,0.141-0.04c-0.014-0.016-0.025-0.039-0.028-0.05c-0.002-0.012-0.006-0.038,0-0.049
+  c0.007-0.012,0.024-0.012,0.033-0.024c0.02-0.028-0.005-0.064,0.023-0.084c0.028-0.02,0.058,0.011,0.085,0.021
+  c0.031,0.012,0.067,0.008,0.065,0.05c-0.003,0.038-0.052,0.063-0.079,0.084c-0.008,0.006-0.024,0.015-0.027,0.025
+  c-0.001,0.002,0.001,0.004,0.001,0.006C-25.854,56.564-25.78,56.543-25.706,56.522z M-29.093,49.403
+  c-0.006,0.016-0.011,0.036-0.032,0.033c-0.008-0.002-0.017-0.013-0.026-0.025l0.016,0.024c-0.018,0.002-0.027-0.025-0.031-0.046
+  l0.005,0.008c-0.001-0.003-0.003-0.006-0.005-0.008c-0.001-0.007-0.001-0.013-0.001-0.018c0-0.021,0.011-0.037,0.018-0.055
+  c0.006-0.015,0.008-0.046,0.024-0.051c0.019-0.006,0.034,0.02,0.043,0.032c0.016,0.026,0.002,0.027-0.001,0.053
+  C-29.085,49.369-29.086,49.386-29.093,49.403z M-29.177,49.371c0.003,0.004,0.007,0.01,0.011,0.018l0,0L-29.177,49.371z
+  M-30.756,48.278c-0.003,0.006-0.009,0.011-0.011,0.018c0,0.002-0.001,0.005-0.001,0.007c-0.002,0.002-0.004,0.005-0.006,0.007
+  c-0.002,0.006-0.002,0.012-0.005,0.018c-0.004,0.01-0.003,0.021-0.006,0.031c-0.006,0.016-0.011,0.032-0.019,0.047
+  c-0.008,0.019-0.025,0.034-0.038,0.051c-0.009,0.011-0.017,0.022-0.026,0.033c-0.006,0.008-0.012,0.016-0.017,0.024
+  c-0.01,0.017-0.014,0.037-0.026,0.053c-0.007,0.01-0.017,0.019-0.024,0.029c-0.009,0.012-0.016,0.023-0.025,0.034
+  c-0.006,0.006-0.01,0.014-0.017,0.02c-0.006,0.006-0.014,0.011-0.019,0.018c-0.007,0.011-0.016,0.019-0.029,0.022
+  c-0.01,0.001-0.022-0.003-0.032,0c-0.004,0.001-0.007,0.006-0.01,0.008c-0.006,0.003-0.009,0.002-0.016,0.002l-0.01-0.007
+  c-0.003-0.003-0.007-0.004-0.011-0.006c-0.008-0.007-0.012-0.018-0.018-0.026c-0.006-0.007-0.007-0.014-0.012-0.021
+  c-0.004-0.006-0.009-0.009-0.013-0.016c-0.004-0.006-0.009-0.012-0.015-0.018c-0.006-0.005-0.012-0.008-0.017-0.013
+  c-0.006-0.005-0.008-0.015-0.01-0.022c-0.002-0.007-0.005-0.013-0.005-0.021c0.001-0.008-0.003-0.014-0.003-0.022
+  c-0.001-0.008,0.001-0.017,0-0.025c-0.003-0.032-0.026-0.059-0.033-0.089c-0.004-0.014-0.005-0.027,0.008-0.037
+  c0.005-0.004,0.012-0.006,0.018-0.009c0.008-0.005,0.017-0.01,0.025-0.015c0.006-0.003,0.012-0.008,0.018-0.012
+  c0.007-0.006,0.011-0.014,0.018-0.02c0.005-0.004,0.01-0.006,0.014-0.011c0.004-0.004,0.005-0.009,0.009-0.013
+  c0.008-0.011,0.022-0.021,0.033-0.029c0.01-0.008,0.018-0.016,0.029-0.022c0.013-0.008,0.023-0.02,0.036-0.029
+  c0.008-0.006,0.014-0.012,0.022-0.018c0.007-0.004,0.013-0.007,0.02-0.011c0.012-0.008,0.026-0.011,0.038-0.017
+  c0.005-0.002,0.01-0.003,0.014-0.007c0.008-0.005,0.017-0.009,0.024-0.015c0.005-0.004,0.01-0.008,0.014-0.01
+  c0.007-0.005,0.014-0.01,0.022-0.014c0.006-0.003,0.011-0.005,0.018-0.004c0.009,0.003,0.016,0.006,0.024,0.009
+  c0.011,0.005,0.02,0.009,0.03,0.015c0.004,0.002,0.007,0.005,0.011,0.007c0.008,0.004,0.008,0.004,0.01,0.012
+  c0.005,0.013,0.002,0.026,0.01,0.039c0.006,0.01,0.026,0.011,0.03,0.021c0.003,0.01-0.003,0.024-0.008,0.032
+  S-30.752,48.27-30.756,48.278z M-30.84,48.052c0,0-0.007,0.007-0.007,0.008c-0.004,0.004-0.006,0.005-0.01,0.008
+  c-0.008,0.005-0.014,0.014-0.022,0.019c-0.01,0.008-0.023,0.016-0.035,0.019c-0.012,0.003-0.023,0.006-0.033,0.014
+  c-0.011,0.007-0.021,0.016-0.032,0.023c-0.003,0.002-0.015,0.009-0.019,0.009c-0.006,0.001-0.014-0.005-0.02-0.01l0.002-0.003
+  c-0.004-0.005-0.005-0.009-0.007-0.015c-0.002-0.007,0-0.014-0.002-0.022c-0.001-0.005-0.006-0.007-0.004-0.014
+  c0.001-0.006,0.006-0.01,0.01-0.014c0.006-0.006,0.01-0.018,0.014-0.026c0.008-0.016,0.019-0.02,0.033-0.029
+  c0.008-0.004,0.011-0.002,0.018,0.001c0.009,0.002,0.011-0.002,0.017-0.008c0.009-0.008,0.019-0.015,0.029-0.024
+  c0.012-0.01,0.022-0.022,0.037-0.029c0.004-0.002,0.009-0.005,0.014-0.007c0.004-0.002,0.012-0.004,0.017-0.002
+  c0.027,0.01,0,0.046,0.001,0.063C-30.839,48.024-30.836,48.042-30.84,48.052z M-31.022,48.138c0.001,0.001,0.003,0.003,0.004,0.004
+  l0,0L-31.022,48.138z M-31.215,48.707c0.002,0.008,0.007,0.015,0.011,0.022c0.005,0.007,0.008,0.014,0.01,0.021
+  c0.003,0.007,0.006,0.014,0.003,0.022c-0.004,0.011-0.009,0.008-0.017,0.01c-0.013,0.003-0.024,0.015-0.035,0.021
+  c-0.006,0.003-0.013,0.005-0.019,0.008c-0.004,0.003-0.008,0.005-0.013,0.007c-0.005,0.002-0.01,0.006-0.015,0.007
+  c-0.005,0.001-0.009,0-0.014,0c-0.009,0.002-0.018,0.004-0.027,0.007c-0.023,0.006-0.046,0.007-0.07,0.013
+  c-0.015,0.004-0.03,0.005-0.046,0.008c-0.013,0.003-0.024,0.007-0.036,0.011c-0.038,0.011-0.072,0.036-0.104,0.057
+  c-0.018,0.012-0.034,0.018-0.054,0.013c-0.01-0.003-0.02,0.001-0.029,0.006c-0.014,0.007-0.025,0.015-0.04,0.021
+  c-0.012,0.004-0.029,0.007-0.042,0.008c-0.006,0-0.012-0.001-0.018-0.001c-0.01,0.001-0.02,0.004-0.029,0.004
+  c-0.009,0.001-0.016-0.001-0.024,0.001c-0.008,0.001-0.014,0.003-0.022,0.003c-0.017,0-0.033,0.002-0.05,0.003
+  c-0.007,0-0.012,0.003-0.018,0.004c-0.009,0.001-0.019,0-0.028,0c-0.01,0-0.017,0.001-0.026,0.003c-0.01,0.001-0.019-0.001-0.028,0
+  c-0.007,0.001-0.014,0.004-0.021,0.004c-0.011,0.001-0.022,0-0.033,0c-0.02,0-0.04,0-0.061,0c-0.023,0-0.053-0.005-0.071-0.021
+  c-0.009-0.009-0.017-0.016-0.025-0.025c-0.004-0.003-0.007-0.007-0.011-0.011c-0.005-0.002-0.012-0.003-0.017-0.005
+  c-0.006-0.002-0.013-0.006-0.018-0.01c-0.01-0.008-0.01-0.018-0.015-0.028c-0.003-0.007-0.007-0.015-0.011-0.022
+  c-0.006-0.01-0.002-0.019,0.001-0.031c0.001-0.004,0.002-0.008,0.004-0.012c-0.004-0.014-0.005-0.028-0.008-0.042
+  c-0.002-0.015,0.011-0.033,0.017-0.047c0.002-0.007,0.006-0.014,0.004-0.022c-0.004-0.009-0.01-0.017-0.011-0.027
+  c-0.001-0.013-0.006-0.024,0.001-0.037c0.002-0.005,0.004-0.009,0.008-0.013c0.005-0.006,0.012-0.01,0.017-0.016
+  c0.005-0.006,0.008-0.009,0.018-0.007c0.003,0.001,0.003,0.003,0.006,0.004c0.004,0.001,0.007,0,0.011,0.001
+  c0.008,0.002,0.013,0.004,0.022,0.002c0.003-0.001,0.007-0.003,0.011-0.004c0.005-0.002,0.008-0.001,0.014-0.002
+  c0.004-0.001,0.006-0.004,0.011-0.004c0.003,0.001,0.007,0.003,0.01,0.003c0.004,0.001,0.008,0,0.011,0
+  c0.004,0.001,0.006,0.003,0.008,0.003c0.007,0.002,0.014,0.001,0.021,0.001c0.009,0,0.016,0.006,0.025,0.007
+  c0.003,0.001,0.007-0.001,0.011,0c0.003,0.001,0.003,0.003,0.006,0.004c0.007,0.001,0.016,0,0.022,0c0.017,0,0.03,0.001,0.042-0.012
+  c0.009-0.009,0.012-0.023,0.022-0.032c0.003-0.004,0.008-0.007,0.011-0.011c0.006-0.006,0.011-0.007,0.018-0.011
+  c0.015-0.007,0.022-0.023,0.03-0.037c0.007-0.013,0.017-0.024,0.024-0.038c0.005-0.012,0.009-0.026,0.014-0.038
+  c0.002-0.006,0.009-0.013,0.01-0.019c0.001-0.003,0-0.007,0.001-0.01c0-0.003,0.003-0.004,0.004-0.007
+  c0-0.005-0.002-0.007-0.003-0.011c-0.002-0.006-0.002-0.012-0.004-0.018c-0.006-0.023-0.004-0.043,0.003-0.064
+  c0.005-0.016,0.011-0.03,0.011-0.047c-0.001-0.016,0-0.035,0.021-0.035c0.017,0,0.021,0.014,0.033,0.024
+  c0.012,0.009,0.027,0.002,0.038-0.003c0.014-0.006,0.027-0.017,0.037-0.028c0.006-0.007,0.014-0.015,0.017-0.023
+  c0.007-0.013,0.012-0.028,0.018-0.042c0.009-0.018,0.018-0.037,0.029-0.054c0.005-0.009,0.011-0.015,0.013-0.024
+  c0.002-0.01-0.002-0.015-0.007-0.022c-0.007-0.012-0.009-0.029-0.006-0.043c0.001-0.008,0.003-0.013,0.003-0.022
+  c0-0.007,0-0.014,0-0.021c0.001-0.02,0.007-0.042,0.014-0.061c0.007-0.019,0.005-0.04,0.009-0.06
+  c0.003-0.019,0.013-0.039,0.013-0.058c0-0.013,0.003-0.03-0.001-0.043c-0.001-0.006-0.005-0.012-0.006-0.018
+  c-0.002-0.007-0.002-0.014-0.003-0.021c-0.001-0.004-0.004-0.004-0.004-0.007c-0.001-0.003,0-0.008,0-0.011
+  c0-0.007-0.001-0.015,0.001-0.021c0.004-0.016,0.005-0.03,0.014-0.043c0.008-0.012,0.019-0.019,0.025-0.032
+  c0.004-0.008,0.02-0.028,0.031-0.026c0.005,0.001,0.011,0.008,0.014,0.012c0.006,0.008,0.004,0.012,0.001,0.02
+  c-0.004,0.017,0.001,0.031,0.01,0.044c0.008,0.014,0.011,0.027,0.016,0.042c0.005,0.017,0.015,0.016,0.028,0.021
+  c0.018,0.007,0.022,0.024,0.028,0.04c0.002,0.006,0.006,0.013,0.007,0.018c0.001,0.003-0.001,0.008,0,0.011
+  c0.001,0.003,0.003,0.008,0.004,0.01c0.004,0.013,0.003,0.026,0.003,0.04c0,0.006,0.002,0.015,0,0.022
+  c-0.001,0.004-0.008,0.016-0.003,0.02c0.01,0.009,0.018-0.03,0.033-0.014c0.009,0.01,0.012,0.031,0.009,0.043
+  c-0.001,0.005-0.003,0.007-0.003,0.011c0,0.004,0.001,0.008,0,0.011c-0.001,0.005-0.005,0.013-0.007,0.018
+  c-0.003,0.006-0.007,0.009-0.011,0.014c-0.003,0.006-0.006,0.012-0.007,0.018c-0.001,0.008,0.001,0.015-0.002,0.022
+  c-0.006,0.014-0.015,0.012-0.026,0.018c-0.008,0.005-0.01,0.012-0.011,0.021c-0.001,0.005-0.001,0.01,0.001,0.014
+  c0.001,0.006,0.001,0.013,0.003,0.018c0.005,0.016,0.017,0.029,0.023,0.043c0.004,0.007,0.008,0.014,0.016,0.017
+  c0.009,0.004,0.016-0.001,0.021-0.006c0.01-0.011,0.017-0.029,0.022-0.043c0.007-0.016,0-0.034,0.017-0.044
+  c0.014-0.007,0.018,0.01,0.025,0.019c0.004,0.005,0.012,0.009,0.018,0.011c0.009,0.001,0.018-0.006,0.025-0.003
+  c0.004,0.001,0.007,0.008,0.01,0.011c0.005,0.003,0.01,0.004,0.015,0.007c0.007,0.005,0.014,0.012,0.019,0.019
+  c0.009,0.012,0.01,0.02,0.01,0.034v0.06c0,0.019,0.003,0.04-0.004,0.058c-0.002,0.007-0.003,0.013-0.003,0.021
+  s-0.003,0.014-0.004,0.021c0,0.004,0.001,0.008,0.001,0.011c-0.001,0.004-0.004,0.007-0.005,0.011c0,0.005,0.001,0.01,0,0.015
+  c-0.001,0.008-0.004,0.017-0.007,0.025c-0.006,0.013-0.012,0.027-0.014,0.042c0,0.008-0.003,0.014-0.004,0.022
+  c-0.003,0.017-0.003,0.03,0,0.048c0.002,0.01,0,0.02,0.001,0.03c0,0.008,0.003,0.016,0.004,0.024c0.002,0.01,0.003,0.02,0.005,0.03
+  c0.003,0.01,0.008,0.019,0.011,0.029c0.005,0.014,0.006,0.029,0.013,0.042c0.002,0.004,0.005,0.011,0.007,0.014
+  c0.004,0.006,0.007,0.007,0.012,0.011c0.009,0.008,0.019,0.022,0.024,0.033C-31.218,48.693-31.217,48.7-31.215,48.707z
+  M-31.576,47.405c-0.012,0.017-0.033,0.042-0.054,0.043c-0.01,0-0.018,0.003-0.029,0.003c-0.009,0.001-0.025-0.005-0.025-0.017
+  l0.011,0.001c-0.008-0.003-0.017-0.012-0.022-0.017c-0.018-0.015-0.019-0.026-0.015-0.048c0.003-0.013,0.006-0.027,0.015-0.037
+  c0.008-0.007,0.016-0.011,0.022-0.021c0.005-0.007,0.005-0.023,0.014-0.025c0.01-0.003,0.02-0.001,0.028-0.008
+  c0.007-0.005,0.009-0.012,0.019-0.01c0.01,0.002,0.018,0.01,0.028,0.011c0.012,0,0.014-0.001,0.019,0.011
+  c0.004,0.009,0.008,0.022,0.007,0.032c-0.002,0.016-0.006,0.031-0.008,0.046C-31.567,47.381-31.57,47.395-31.576,47.405z
+  M-32.403,49.724C-32.403,49.723-32.403,49.723-32.403,49.724L-32.403,49.724L-32.403,49.724z M-32.319,48.806
+  c-0.002,0.006,0,0.006-0.004,0.012c-0.002,0.003-0.005,0.006-0.007,0.009c-0.004,0.006-0.006,0.013-0.008,0.019
+  c-0.003,0.007-0.003,0.013-0.006,0.02c0,0.001-0.007,0.011-0.008,0.011c-0.005,0.003-0.01-0.002-0.015-0.003l-0.008-0.004
+  c-0.004-0.014-0.016-0.027-0.021-0.04c-0.003-0.008-0.005-0.014-0.011-0.021c-0.002-0.002-0.005-0.007-0.007-0.008
+  c-0.003-0.002-0.007-0.001-0.009-0.003c-0.006-0.003-0.01-0.011-0.015-0.017c-0.006-0.008-0.004-0.009-0.002-0.019
+  c0.003-0.011-0.005-0.009-0.01-0.016c-0.004-0.007,0.001-0.017,0.003-0.024c0.005-0.013,0.006-0.029,0.012-0.044
+  c0.005-0.012,0.012-0.025,0.019-0.036c0.006-0.009,0.002-0.015,0.005-0.024c0.002-0.006,0.009-0.008,0.011-0.015
+  c0.002-0.007,0.005-0.018,0.004-0.024c-0.001-0.009-0.008-0.021,0.005-0.024c0.007-0.003,0.014,0,0.019,0.005
+  c0.006,0.006,0.004,0.01,0.006,0.019c0.003,0.015,0.012,0.028,0.016,0.043c0.001,0.004,0.002,0.004,0.003,0.009
+  c0,0.007,0.002,0.01,0.003,0.016c0.002,0.008,0.003,0.015,0.006,0.024c0.002,0.008,0.006,0.012,0.011,0.019
+  c0.005,0.008,0.007,0.017,0.011,0.025c0.006,0.014,0.009,0.028,0.009,0.043c0,0.01,0.001,0.019-0.003,0.028
+  C-32.313,48.793-32.317,48.8-32.319,48.806z M-32.951,49.238c-0.004,0.004-0.007,0.009-0.011,0.013
+  c-0.005,0.007-0.015,0.019-0.017,0.027s0.001,0.009-0.005,0.015c-0.003,0.004-0.006,0.007-0.01,0.01
+  c-0.011,0.011-0.017,0.014-0.017,0.031c0,0.014-0.003,0.026-0.01,0.037c-0.004,0.005-0.011,0.011-0.018,0.011
+  c-0.008,0.001-0.011-0.006-0.015-0.012c0.008-0.018-0.01-0.041-0.02-0.056c-0.011-0.018-0.03-0.034-0.033-0.056
+  c-0.001-0.014,0.009-0.022,0.015-0.033c0.008-0.012,0.016-0.023,0.025-0.035c0.007-0.01,0.014-0.02,0.024-0.028
+  c0.004-0.002,0.009-0.004,0.012-0.008c0.002-0.005,0.001-0.014,0.005-0.019c0.002,0,0.004-0.001,0.006-0.001
+  c0.003-0.002,0.004-0.005,0.006-0.007c0.007-0.005,0.01-0.005,0.019-0.005c0.012,0.001,0.031-0.004,0.039,0.005
+  c0.009,0.01,0.013,0.018,0.013,0.031c0,0.007,0,0.014,0,0.02c0,0.01,0.005,0.015,0.009,0.023c0.003,0.007,0.003,0.01-0.001,0.018
+  C-32.939,49.226-32.945,49.232-32.951,49.238z M-33.22,48.753c-0.008,0.025-0.021,0.047-0.041,0.062
+  c-0.017,0.014-0.035,0.032-0.048,0.05c-0.013,0.02-0.032,0.039-0.042,0.061c-0.004,0.007-0.007,0.013-0.01,0.02
+  c-0.002,0.004-0.005,0.008-0.007,0.012c-0.003,0.003-0.003,0.007-0.005,0.011c-0.008,0.013-0.022,0.025-0.031,0.037
+  c-0.005,0.006-0.009,0.013-0.013,0.02c-0.003,0.004-0.008,0.007-0.011,0.011c-0.006,0.008-0.006,0.014-0.013,0.022
+  c-0.008,0.009-0.018,0.015-0.027,0.023c-0.007,0.007-0.012,0.014-0.019,0.021c-0.005,0.004-0.013,0.01-0.02,0.005
+  c-0.007-0.004-0.004-0.011-0.006-0.018c-0.001,0-0.002,0-0.003-0.001l-0.004-0.004c0-0.009,0.003-0.015,0.004-0.023
+  c0.001-0.005,0-0.011,0-0.015c0-0.007,0.002-0.011,0.003-0.016c0.004-0.02,0.008-0.039,0.014-0.057
+  c0.005-0.016,0.005-0.032,0.011-0.048c0.003-0.008,0.004-0.017,0.009-0.023c0.007-0.008,0.012-0.01,0.016-0.02
+  c0.001-0.004,0.002-0.004,0.003-0.009c0-0.004-0.001-0.007,0.001-0.011c0.002-0.004,0.008-0.008,0.012-0.012
+  c0.007-0.008,0.011-0.019,0.015-0.029c0.003-0.009,0.008-0.012,0.013-0.02c0.005-0.007,0.007-0.016,0.01-0.025
+  c0.004-0.012,0.008-0.013,0.016-0.023c0.009-0.012,0.012-0.027,0.021-0.04c0.009-0.012,0.017-0.022,0.025-0.035
+  c0.005-0.009,0.008-0.016,0.015-0.024c0.005-0.008,0.007-0.017,0.012-0.024c0.006-0.008,0.013-0.013,0.021-0.019
+  c0.001-0.002,0.003-0.005,0.005-0.006c0.003-0.002,0.006-0.002,0.008-0.004c0.01-0.007,0.013-0.029,0.029-0.023
+  c0.013,0.004,0.016,0.023,0.019,0.033c0.003,0.007,0.005,0.013,0.01,0.018c0.003,0.004,0.007,0.006,0.01,0.01
+  c0.005,0.004,0.003,0.005,0.005,0.011c0.005,0.014,0.017,0.031,0.019,0.047c0.002,0.012-0.004,0.014-0.011,0.022
+  C-33.213,48.73-33.216,48.742-33.22,48.753z M-33.383,48.53c-0.013,0.006-0.025,0.013-0.038,0.017
+  c-0.014,0.005-0.02,0.014-0.029,0.024c-0.008,0.008-0.016,0.012-0.026,0.016c-0.007,0.003-0.01,0.004-0.017-0.001
+  c-0.005-0.002-0.011-0.006-0.012-0.011l-0.008-0.009c-0.008-0.007-0.014-0.015-0.02-0.024c-0.003-0.004-0.01-0.011-0.011-0.016
+  c-0.004-0.011-0.001-0.028,0.002-0.039c0.003-0.009,0.001-0.021,0.009-0.027c0.004-0.004,0.01-0.005,0.015-0.01
+  c0.003-0.004,0.005-0.008,0.008-0.012c0.002-0.004,0.007-0.007,0.01-0.01c0.005-0.006,0.008-0.012,0.015-0.016
+  c0.006-0.005,0.008-0.004,0.016-0.005c0.007-0.001,0.012-0.004,0.02-0.004s0.012,0.003,0.02,0.004
+  c0.012,0.002,0.025-0.003,0.036,0.003c0.006,0.003,0.014,0.008,0.019,0.013s0.006,0.013,0.012,0.017
+  c0.007,0.004,0.014,0,0.019,0.004c0.004,0.002,0.006,0.008,0.008,0.012c0.007,0.013,0.012,0.016,0.005,0.031
+  c-0.006,0.013-0.011,0.017-0.023,0.024C-33.364,48.516-33.372,48.525-33.383,48.53z M-33.559,49.088
+  c-0.003,0.01-0.003,0.011-0.01,0.017c-0.006,0.006-0.017,0.007-0.021,0.015c-0.003,0.005,0,0.013-0.001,0.021
+  c-0.001,0.013,0.004,0.016-0.01,0.02l-0.005-0.007c-0.014,0.002-0.02-0.026-0.017-0.036c0.004-0.01,0.006-0.017,0.007-0.027
+  c0-0.009-0.002-0.017,0-0.025c0.002-0.015,0.003-0.029,0.011-0.042c0.003-0.006,0.008-0.011,0.013-0.016
+  c0.009-0.01,0.013-0.012,0.025-0.005c0.007,0.003,0.011,0.005,0.014,0.012c0.004,0.008,0.006,0.018,0.005,0.028
+  c-0.001,0.007,0.001,0.014,0,0.021C-33.55,49.072-33.557,49.079-33.559,49.088z M-33.537,48.952
+  c-0.006,0.009-0.019,0.019-0.031,0.016l0.004-0.008c-0.003,0-0.009,0.002-0.012,0.001c-0.006-0.002-0.005-0.007-0.009-0.012
+  c-0.006-0.008-0.011-0.012-0.011-0.024c-0.001-0.009,0.003-0.016,0.004-0.025c0.003-0.02,0-0.043,0-0.063
+  c0-0.012,0.002-0.018,0.005-0.029c0.003-0.012,0.002-0.021,0.011-0.03c0.006-0.006,0.013-0.01,0.015-0.018
+  c0.001-0.005,0-0.01,0.001-0.015c0.001-0.006,0.004-0.01,0.005-0.015c0.008-0.001,0.023-0.005,0.03-0.01
+  c0.01-0.007,0.011-0.016,0.014-0.026c0.002-0.008,0.01-0.013,0.016-0.02c0.008-0.009,0.007-0.022,0.014-0.033
+  c0.012-0.021,0.045-0.029,0.058-0.005c0.006,0.012,0.001,0.021-0.002,0.033c-0.001,0.005,0.001,0.012,0.001,0.017
+  c-0.001,0.012-0.007,0.022-0.009,0.034c0,0.007,0,0.014-0.004,0.021c-0.004,0.006-0.01,0.011-0.014,0.017
+  c-0.007,0.009-0.016,0.017-0.02,0.028c-0.01,0.025-0.031,0.045-0.04,0.071c-0.005,0.011-0.007,0.023-0.01,0.035
+  c-0.001,0.004-0.003,0.006-0.003,0.013s-0.003,0.009-0.004,0.015c-0.002,0.005,0.001,0.011,0,0.017S-33.534,48.947-33.537,48.952z
+  M-33.541,48.343c-0.002,0.008-0.003,0.013-0.003,0.021c0,0.01,0,0.011-0.005,0.019c-0.007,0.012-0.019,0.023-0.023,0.036
+  c-0.002,0.007-0.003,0.013-0.007,0.02c-0.003,0.006-0.009,0.014-0.009,0.02s0.003,0.01,0.004,0.016
+  c0.001,0.007-0.002,0.012-0.003,0.017c-0.002,0.012-0.002,0.025-0.009,0.035c-0.002,0.004-0.005,0.008-0.009,0.011
+  c-0.003,0.002-0.014,0.007-0.018,0.008c0-0.006-0.006-0.009-0.005-0.015l-0.008-0.004c0-0.008,0.001-0.016,0.001-0.023
+  c-0.001-0.013-0.008-0.025-0.009-0.037c0-0.005,0.002-0.011,0.001-0.016c-0.001-0.004-0.004-0.008-0.005-0.012
+  c-0.001-0.006,0-0.006-0.003-0.012c-0.003-0.004-0.008-0.009-0.012-0.013c-0.008-0.01-0.015-0.022-0.025-0.03
+  c-0.007-0.004-0.017-0.005-0.023-0.009c-0.005-0.005-0.012-0.016-0.013-0.024c0-0.008,0.005-0.015,0.005-0.024
+  c-0.001-0.008,0.002-0.016,0.003-0.024c0.004-0.016,0.011-0.034,0.017-0.051c0.003-0.005,0.005-0.015,0.008-0.02
+  c0.004-0.005,0.009-0.009,0.012-0.016c0.003-0.009,0.007-0.019,0.008-0.028c0-0.009-0.002-0.019,0-0.028
+  c0.007,0,0.01-0.003,0.015-0.004c0.006-0.002,0.014,0.001,0.02,0c0.013-0.002,0.021-0.011,0.031-0.017c0.009-0.006,0.011,0,0.02,0
+  c0.008,0,0.013-0.003,0.021-0.003c0.014,0,0.027,0.001,0.04,0.007c0.01,0.005,0.02,0.014,0.029,0.02
+  c0.007,0.005,0.012,0.016,0.016,0.024c0.005,0.011,0.009,0.018,0.006,0.032c-0.004,0.022-0.019,0.029-0.031,0.045
+  C-33.523,48.289-33.533,48.314-33.541,48.343z M-32.86,55.655c0.007,0.016,0.017,0.03,0.024,0.047
+  c0.017,0.042,0.038,0.08,0.055,0.121c0.017,0.04,0.045,0.07,0.072,0.105c0.02,0.024,0.06,0.071,0.052,0.104
+  c-0.017-0.006-0.026-0.023-0.041-0.031l-0.006,0.005c-0.033-0.027-0.062-0.063-0.067-0.105c-0.005-0.03-0.024-0.065-0.039-0.094
+  c-0.009-0.018-0.031-0.033-0.035-0.052c-0.002-0.008,0.001-0.017-0.001-0.025c-0.004-0.012-0.016-0.028-0.021-0.04
+  c-0.008-0.018-0.015-0.031-0.02-0.051c-0.003-0.012-0.021-0.054,0.006-0.037C-32.866,55.611-32.865,55.641-32.86,55.655z
+  M-31.614,57.091c0.006,0.006,0.009,0.014,0.014,0.021c0.002,0.003,0.004,0.007,0.007,0.011c0.001,0.001,0.003,0.002,0.004,0.004
+  c0.002,0.003,0.005,0.004,0.007,0.006c0.002,0.002,0.004,0.005,0.006,0.008c0.003,0.004,0.005,0.008,0.008,0.013
+  c0.003,0.005,0.006,0.011,0.009,0.017c0.001,0.004,0.004,0.007,0.008,0.01c0.003,0.002,0.004,0.005,0.006,0.009
+  c0.002,0.003,0.003,0.008,0.006,0.011c0.004,0.004,0.007,0.009,0.008,0.014c0.002,0.005,0.003,0.009,0.005,0.014
+  c0.001,0.002,0.002,0.004,0.004,0.006c0.002,0.002,0.005,0.003,0.007,0.006c0.002,0.003,0.005,0.005,0.007,0.008
+  c0.001,0.002,0.002,0.004,0.004,0.006c0.001,0.003,0.004,0.006,0.007,0.009c0.001,0.001,0.003,0.002,0.004,0.004
+  c0.001,0.001,0.002,0.002,0.002,0.003c0.003,0.005,0.007,0.01,0.009,0.015c0.003,0.009,0.007,0.017,0.011,0.025
+  c0.001,0.003,0.002,0.007,0.004,0.01c0.001,0.002,0.005,0.007,0.004,0.009c-0.001,0-0.004-0.004-0.004-0.005
+  c-0.002-0.002-0.003-0.003-0.005-0.005c-0.004-0.003-0.008-0.007-0.013-0.01c-0.003-0.002-0.007-0.005-0.009-0.008
+  c-0.001-0.002-0.003-0.003-0.004-0.005c-0.001-0.002-0.003-0.004-0.004-0.007c-0.001-0.002-0.002-0.004-0.004-0.006
+  c-0.001-0.001-0.003-0.002-0.004-0.003c-0.003-0.004-0.003-0.009-0.005-0.013c-0.002-0.003-0.004-0.005-0.007-0.007
+  c-0.003-0.004-0.005-0.008-0.007-0.012c-0.002-0.003-0.003-0.007-0.005-0.01c-0.002-0.005-0.004-0.01-0.007-0.014
+  c-0.005-0.007-0.011-0.014-0.016-0.021c-0.002-0.004-0.006-0.007-0.008-0.011c-0.003-0.004-0.006-0.008-0.008-0.012
+  c-0.005-0.007-0.009-0.015-0.014-0.022c-0.003-0.004-0.007-0.008-0.01-0.012c-0.003-0.003-0.005-0.008-0.006-0.012
+  c-0.002-0.004-0.003-0.008-0.006-0.012c-0.001-0.001-0.002-0.002-0.002-0.004c-0.001,0-0.001-0.001-0.001-0.001s0,0,0-0.001
+  c-0.001-0.001-0.001-0.002-0.002-0.004c0-0.002-0.001-0.002-0.001-0.003s0-0.002,0-0.003s-0.001-0.001-0.001-0.002
+  c0-0.001,0-0.002-0.001-0.003c-0.001-0.004-0.003-0.007-0.004-0.01c-0.001-0.002-0.001-0.004,0.001-0.004
+  C-31.618,57.088-31.615,57.09-31.614,57.091z M-31.125,57.71c0.016,0.015,0.034,0.023,0.052,0.036
+  c0.023,0.015,0.041,0.038,0.063,0.054c0.033,0.024,0.065,0.05,0.1,0.072c0.018,0.011,0.033,0.026,0.051,0.039
+  c0.014,0.01,0.034,0.018,0.042,0.034c-0.014,0.003-0.039-0.014-0.053-0.019c-0.014-0.004-0.044-0.007-0.051-0.022l0,0
+  c-0.026-0.02-0.048-0.046-0.072-0.069c-0.023-0.022-0.049-0.034-0.069-0.058c-0.027-0.032-0.054-0.036-0.09-0.055
+  c-0.018-0.009-0.059-0.045-0.062-0.068c0.023-0.02,0.031,0.013,0.043,0.024C-31.158,57.69-31.14,57.698-31.125,57.71z
+  M-22.303,59.124c0.005-0.006,0.012-0.01,0.017-0.016c0.004-0.007,0.003-0.01,0.006-0.016c0.004-0.01,0.012-0.017,0.017-0.027
+  c0.001-0.002,0.002-0.01,0.003-0.012c0.003-0.005,0.008-0.009,0.013-0.015c0.009-0.01,0.011-0.012,0.026-0.012
+  c0.01,0.001,0.018-0.002,0.027-0.005c0.01-0.004,0.022-0.01,0.032-0.011c0.005-0.001,0.012,0,0.017,0
+  c0.009,0,0.013-0.002,0.022-0.004c0.012-0.003,0.021-0.004,0.033-0.011c0.007-0.004,0.013-0.008,0.021-0.012
+  c0.01-0.005,0.018-0.01,0.026-0.018c0.003-0.003,0.005-0.006,0.008-0.008c0.005-0.004,0.009-0.005,0.014-0.008
+  c0.014-0.011,0.017-0.026,0.027-0.039c0.011-0.016,0.034-0.026,0.049-0.037c0.006-0.005,0.01-0.012,0.017-0.017
+  c0.01-0.006,0.022-0.011,0.033-0.015c0.019-0.007,0.035-0.021,0.055-0.026c0.019-0.004,0.046-0.006,0.064-0.019
+  c0.015-0.01,0.029-0.025,0.046-0.035c0.005-0.003,0.019-0.011,0.025-0.006c0.008,0.008-0.004,0.018-0.009,0.022
+  c-0.012,0.012-0.026,0.02-0.038,0.033c-0.013,0.014-0.027,0.028-0.041,0.041c-0.005,0.004-0.012,0.01-0.016,0.016
+  c-0.006,0.009-0.005,0.02-0.009,0.029c-0.012,0.023-0.036,0.037-0.055,0.053c-0.007,0.006-0.012,0.011-0.018,0.017
+  c-0.011,0.012-0.017,0.025-0.027,0.039c-0.014,0.021-0.051,0.038-0.075,0.042c-0.012,0.002-0.025,0-0.037,0.002
+  c-0.009,0.002-0.019,0.008-0.029,0.011c-0.011,0.003-0.028,0.009-0.036,0.016c-0.005,0.005-0.007,0.011-0.012,0.016
+  c-0.005,0.004-0.011,0.007-0.016,0.01c-0.009,0.006-0.018,0.015-0.027,0.021c-0.017,0.01-0.037,0.015-0.054,0.023
+  c-0.013,0.006-0.021,0.004-0.034,0.005c-0.011,0.002-0.021,0.007-0.032,0.01c-0.011,0.003-0.027,0.003-0.038,0.001
+  c-0.01-0.001-0.016-0.005-0.025-0.005l0.003-0.006C-22.321,59.142-22.312,59.134-22.303,59.124z M-22.336,59.162
+  c-0.004,0.001-0.005-0.001-0.005-0.004c0.003-0.001,0.006-0.001,0.008-0.001L-22.336,59.162z M-21.881,59.028
+  c-0.01-0.011,0.016-0.024,0.024-0.029c0.007-0.004,0.016-0.006,0.023-0.009c0.005-0.002,0.008-0.003,0.011-0.006
+  c0.005-0.002,0.007-0.009,0.011-0.011c0.006-0.004,0.015-0.002,0.022-0.005c0.007-0.004,0.014-0.009,0.02-0.013
+  c0.009-0.005,0.047-0.031,0.044-0.005c0,0.005-0.007,0.018-0.01,0.022c-0.003,0.006-0.008,0.011-0.012,0.016
+  c-0.008,0.011-0.02,0.027-0.034,0.032c-0.008,0.002-0.016,0-0.024,0.002c-0.009,0.002-0.014,0.008-0.023,0.01
+  c-0.011,0.002-0.023,0-0.033,0c-0.013-0.001-0.021,0.004-0.033,0.005l0.011-0.005C-21.883,59.03-21.882,59.029-21.881,59.028z
+  M-23.012,48.049c0.012-0.009,0.023-0.017,0.03-0.03c0.003-0.007,0.004-0.011,0.011-0.014c0.006-0.002,0.012-0.003,0.018-0.003
+  c0.025-0.001,0.044,0.01,0.051,0.036c0.005,0.018,0.007,0.037,0.01,0.056c0.002,0.017,0.009,0.033,0.012,0.05
+  c0.002,0.014,0.004,0.027,0.001,0.041c-0.003,0.013-0.006,0.019-0.018,0.024c-0.024,0.011-0.052,0.005-0.076,0
+  c-0.008-0.002-0.016-0.005-0.022-0.01c-0.007-0.005-0.012-0.013-0.021-0.014h0.013c-0.003,0-0.005-0.003-0.008-0.005
+  c-0.006-0.006-0.01-0.008-0.014-0.015c-0.005-0.008-0.012-0.014-0.015-0.023c-0.003-0.006-0.005-0.014-0.006-0.021
+  c-0.001-0.014-0.002-0.033,0.006-0.046C-23.032,48.063-23.023,48.056-23.012,48.049z M-22.19,43.243
+  c0.013,0.002,0.025,0.012,0.037,0.018c0.011,0.005,0.021,0,0.032,0.003c0.005,0.001,0.005,0.005,0.01,0.006
+  c0.007,0.002,0.014-0.002,0.021-0.001c0.01,0.002,0.018,0.007,0.026,0.012c0.007,0.004,0.012,0.01,0.019,0.014
+  c0.008,0.005,0.017,0.005,0.024,0.013c0.007,0.007,0.016,0.02,0.005,0.025c-0.002,0.001-0.013,0.003-0.016,0.004
+  c-0.008,0.002-0.014,0.004-0.021,0.008c-0.01,0.005-0.016,0.01-0.026,0.014c-0.005,0.002-0.005,0.005-0.011,0.005
+  c-0.005,0-0.014-0.005-0.021-0.005c-0.023,0-0.044-0.011-0.066-0.01c-0.002-0.002-0.004-0.005-0.006-0.007
+  c-0.01-0.01-0.019-0.021-0.027-0.032c-0.006-0.007-0.011-0.016-0.017-0.024c-0.011-0.018,0.002-0.022,0.015-0.033
+  C-22.204,43.246-22.201,43.241-22.19,43.243z M-22.195,43.354c0.006-0.003,0.012-0.004,0.018-0.005
+  c0.002,0.002,0.005,0.004,0.007,0.005H-22.195z M-21.865,43.386c0.003-0.011,0-0.022,0.001-0.032
+  c0.001-0.003,0.005-0.01,0.005-0.012c0.001-0.008-0.003-0.011-0.005-0.02c-0.002-0.015-0.002-0.047,0.016-0.053
+  c0.009-0.002,0.024,0.001,0.033,0.001c0.017,0,0.031,0,0.047-0.006c0.02-0.007,0.035-0.012,0.057-0.006
+  c0.024,0.006,0.042-0.011,0.063,0.003c0.015,0.009,0.031,0.023,0.039,0.039c0.009,0.019,0.009,0.042,0.009,0.065
+  c0,0.019-0.004,0.044,0.004,0.063c0.009,0.02,0.024,0.035,0.038,0.052c0.015,0.018,0.027,0.036,0.038,0.057
+  c0.004,0.008,0.008,0.013,0.009,0.022c0.003,0.017,0.001,0.021-0.015,0.021c-0.02,0-0.037-0.013-0.053-0.025
+  c-0.023-0.016-0.058-0.029-0.086-0.036c-0.024-0.007-0.046-0.017-0.071-0.022c-0.015-0.003-0.025,0.004-0.038,0.003
+  c-0.01,0-0.021-0.008-0.031-0.009c-0.011-0.001-0.021-0.002-0.031-0.006c-0.003-0.001-0.009-0.007-0.012-0.009
+  c-0.004-0.002-0.011-0.005-0.014-0.007c-0.007-0.007-0.005-0.017-0.011-0.023l0.004,0.003
+  C-21.886,43.435-21.868,43.401-21.865,43.386z"/>
+</svg>
diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn
index d36db04424ad..f14c5cd9d139 100644
--- a/browser/branding/official/content/jar.mn
+++ b/browser/branding/official/content/jar.mn
@@ -15,6 +15,7 @@ browser.jar:
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.png      (identity-icons-brand.png)
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
+  content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
 #ifdef MOZ_METRO
   content/branding/metro-about.css               (metro-about.css)
diff --git a/browser/branding/official/content/silhouette-40.svg b/browser/branding/official/content/silhouette-40.svg
new file mode 100644
index 000000000000..3b71f15892ff
--- /dev/null
+++ b/browser/branding/official/content/silhouette-40.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="-45 31 40 40"
+ enable-background="new -45 31 40 40">
+ <path fill="#CCCCCC" d="M-14.1,54.7c0.7-1.4,1.7-4.4,0.8-6.9c0,0,0,0,0,0.1l0,0c0,0-0.2,0.5-0.4,1.3c0-0.1,0-0.2,0-0.3
+  c0.1-0.9,0-1.9-0.1-2.9c-0.3-1.5-1.4-2.8-2-3.2c0,0,0.1,0,0.1,0.1c-0.1-0.1-0.1-0.1-0.1-0.1s0,0.1,0.1,0.4c-0.7-1.1-1.6-1.5-1.6-1.5
+  s0,0.2,0.1,0.5c-2-1.9-4.7-3-7.6-3c-3,0-5.7,1.2-7.8,3.1c0.1,0.1,0.2,0.3,0.4,0.5c0,0,0.8-0.1,1.7-0.1c1.7-1.2,3.6-1.8,5.7-1.8
+  c2.6,0,5.1,1.1,7,3c-0.2-0.1-0.1,0,0,0.1c-0.6-0.4-1.2-0.8-1.7-0.8c1,0.8,2.6,2.7,2.4,6.2c-0.3-0.6-0.6-1-0.9-1.3
+  c0.4,3.5,0,4.2-0.2,5.1c0-0.4-0.2-0.7-0.3-0.9c0,0,0,1.1-0.7,2.6c-0.5,1.2-1.1,1.5-1.3,1.5c-0.2,0-0.1-0.2-0.1-0.4
+  c0,0-0.4,0.2-0.7,0.6c-0.3,0.4-0.6,0.8-0.8,0.6c0.1-0.1,0.2-0.3,0.3-0.4c-0.1,0.1-0.5,0.4-1.2,0.5c-0.3,0-1.6,0.3-3.3-0.6
+  c0.3,0,0.6-0.1,0.9,0.1c-0.3-0.3-1-0.3-1.5-0.4c-0.5-0.4-1.1-1-1.4-1.4c1.3,0.3,2.8,0.1,3.6-0.5s1.3-1,1.8-0.9
+  c0.4,0.1,0.7-0.4,0.4-0.8c-0.3-0.4-1.2-1-2.3-0.7c-0.8,0.2-1.8,1.1-3.3,0.2c-1.3-0.8-1.3-1.4-1.3-1.8c0-0.3,0.2-0.7,0.5-0.8
+  c0.2,0.1,0.3,0.1,0.3,0.1s-0.1-0.1-0.1-0.2l0,0c0.1,0,0.4,0.2,0.6,0.2c0.2,0.1,0.3,0.2,0.3,0.2s0,0,0-0.1c0,0-0.1-0.2-0.3-0.3l0,0
+  c0.1,0,0.2,0.1,0.4,0.2c0-0.2,0.1-0.4,0.1-0.7c0-0.2,0-0.3-0.1-0.4c-0.1-0.1,0-0.1,0.1,0c0-0.1,0-0.1-0.1-0.2l0,0c0,0,0,0,0-0.1
+  c0.2-0.3,1.8-1.2,1.9-1.3c0.2-0.1,0.3-0.3,0.4-0.5c0.2-0.1,0.3-0.5,0.3-0.8c0-0.1-0.2-0.3-0.4-0.3c-0.1,0-0.4-0.1-0.6,0l0,0
+  c-0.3,0-0.7,0-1.2,0s-0.8-0.3-1-0.6c0-0.1-0.1-0.1-0.1-0.2c0-0.1-0.1-0.2-0.1-0.2c0.2-0.8,0.7-1.5,1.4-2.1c0,0-0.2,0-0.1,0
+  c0,0,0.3-0.2,0.4-0.2c0.1,0-0.3-0.1-0.6-0.1c-0.5,0.2-0.6,0.2-0.8,0.3c0.1-0.1,0.3-0.2,0.2-0.2c-0.3,0.1-0.7,0.4-1.1,0.6v-0.1
+  c-0.2,0.1-0.6,0.4-0.7,0.7c0-0.1,0-0.1,0-0.1c-0.1,0-0.2,0.2-0.3,0.3l0,0c-1.1-0.3-2-0.2-2.8,0c-0.2-0.1-0.6-0.5-0.9-1
+  c0,0,0,0.1-0.1,0.1c-0.1-0.4-0.3-0.9-0.3-1.3v-0.1c0,0-0.1,0.1-0.3,0.3c-0.1,0.2-0.2,0.3-0.2,0.5c0,0.1-0.1,0.2-0.1,0.2v-0.2
+  c0,0.1-0.1,0.2-0.2,0.3c0,0.2,0,0.3-0.1,0.4l0,0c0,0,0-0.2,0-0.1c-0.1,0.2-0.2,0.5-0.2,0.8c-0.1,0.3-0.1,0.5-0.1,0.8s0,0.7,0,1.2
+  c0,0.1,0,0.1,0,0.2c-0.3,0.4-0.5,0.7-0.6,0.9c-0.4,0.7-0.7,1.8-1,3.5c0,0,0.2-0.6,0.6-1.3l0,0c-0.3,0.9-0.5,2.3-0.4,4.4
+  c0-0.1,0.1-0.6,0.2-1.3c0.1,1.4,0.5,3.1,1.5,5c0.8,1.4,1.7,2.4,2.7,3.2c0.2,0.2,0.4,0.3,0.6,0.5c1.3,1,3.3,2.1,5,2.4
+  c-0.6-0.2-1-0.5-1-0.5s2,0.7,3.5,0.6c-0.5-0.1-0.6-0.3-0.6-0.3s4.2,0.2,6.4-1.5c0.5-0.4,0.8-0.8,0.9-1.2c0.6-0.4,1.3-0.8,2-1.6
+  c1.2-1.2,1.3-2.1,1.4-3v0.1C-14,55.2-14,54.9-14.1,54.7z"/>
+</svg>
diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn
index dc07b3d8f6a4..f123f48fdfaa 100644
--- a/browser/branding/unofficial/content/jar.mn
+++ b/browser/branding/unofficial/content/jar.mn
@@ -16,6 +16,7 @@ browser.jar:
   content/branding/icon128.png                   (../mozicon128.png)
   content/branding/identity-icons-brand.png      (identity-icons-brand.png)
   content/branding/identity-icons-brand@2x.png   (identity-icons-brand@2x.png)
+  content/branding/silhouette-40.svg             (silhouette-40.svg)
   content/branding/aboutDialog.css               (aboutDialog.css)
 #ifdef MOZ_METRO
   content/branding/metro-about.css               (metro-about.css)
diff --git a/browser/branding/unofficial/content/silhouette-40.svg b/browser/branding/unofficial/content/silhouette-40.svg
new file mode 100644
index 000000000000..929295ad612a
--- /dev/null
+++ b/browser/branding/unofficial/content/silhouette-40.svg
@@ -0,0 +1,1359 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="-45 31 40 40"
+ enable-background="new -45 31 40 40">
+ <path fill="#CCCCCC" d="M-25,62.991c-6.622,0-11.991-5.369-11.991-11.991S-31.622,39.009-25,39.009S-13.009,44.378-13.009,51
+  S-18.378,62.991-25,62.991z M-34.439,48.549c-0.002,0.007-0.004,0.013-0.006,0.02c0.002-0.004,0.006-0.006,0.007-0.01
+  C-34.437,48.555-34.438,48.552-34.439,48.549z M-34.259,47.956c-0.001-0.006-0.003-0.005-0.002-0.012l0,0
+  c-0.001,0.004-0.003,0.008-0.004,0.012l0.008,0.006C-34.258,47.96-34.258,47.958-34.259,47.956z M-34.245,48.067
+  c-0.02,0.006-0.04,0.012-0.06,0.019c-0.026,0.084-0.054,0.168-0.078,0.254c0.004-0.002,0.007-0.004,0.01-0.008
+  c0.007-0.006,0.013-0.014,0.019-0.021c0.008-0.007,0.009-0.014,0.011-0.023c0.003-0.009,0.003-0.01,0.008-0.017
+  c0.01-0.012,0.006-0.037,0.005-0.051c0-0.011-0.007-0.015,0-0.024c0.005-0.007,0.012-0.014,0.017-0.019
+  c0.011-0.01,0.026-0.015,0.039-0.022c0.007-0.003,0.013-0.008,0.017-0.014c0.003-0.005,0.004-0.011,0.007-0.017
+  c0.007-0.014,0.008-0.027,0.008-0.044C-34.242,48.074-34.243,48.071-34.245,48.067z M-16.736,45.824
+  c0.001,0.012,0.002,0.024,0.007,0.036c0.006,0.017,0.012,0.034,0.011,0.054c0,0.017,0.007,0.032,0.011,0.049
+  c0.004,0.024,0.013,0.043,0.024,0.064c0.004,0.009,0.009,0.017,0.013,0.026c0.008,0.012,0.014,0.025,0.021,0.038
+  c0.009,0.017,0.014,0.034,0.022,0.051c0.004,0.008,0.006,0.016,0.008,0.024c0.002,0.005,0.003,0.013,0.007,0.017
+  c-0.02-0.021-0.027-0.053-0.042-0.077c-0.013-0.021-0.029-0.04-0.041-0.061c-0.009-0.016-0.021-0.028-0.023-0.045
+  c-0.002-0.015-0.003-0.029-0.007-0.042c-0.003-0.007-0.004-0.012-0.009-0.019c-0.004-0.007-0.011-0.011-0.015-0.018
+  c-0.01-0.015-0.018-0.034-0.025-0.051c-0.01-0.022-0.015-0.05-0.037-0.064c0.004,0.004,0.008,0.014,0.009,0.02
+  c0.002,0.007,0.005,0.015,0.005,0.022c0,0.013-0.007,0.013-0.014,0.004c-0.005-0.006-0.007-0.015-0.01-0.023
+  c-0.001-0.003-0.005-0.009-0.005-0.012c-0.001-0.004,0-0.007-0.001-0.01c-0.001-0.006-0.006-0.013-0.009-0.019
+  c-0.004-0.01-0.007-0.018-0.014-0.027c-0.006-0.008-0.012-0.014-0.016-0.025c-0.005-0.014-0.007-0.028-0.017-0.04
+  s-0.018-0.001-0.028,0.005c-0.006,0.004-0.014,0.005-0.022,0.008c-0.008,0.002-0.015,0.005-0.023,0.007
+  c-0.006,0.002-0.012,0.003-0.018,0.005c-0.003,0.001-0.004,0.002-0.008,0.003c-0.004,0-0.008-0.001-0.012,0
+  c-0.01,0.001-0.018,0.005-0.029,0.003c-0.003-0.001-0.005-0.003-0.008-0.003c-0.004-0.001-0.008-0.001-0.012,0
+  c-0.02,0.001-0.016,0.025-0.012,0.039c0.004,0.017,0.013,0.032,0.021,0.047c0.001,0.004,0.004,0.008,0.006,0.012
+  c0.001,0.004-0.001,0.007,0,0.011c0.002,0.009,0.006,0.017,0.004,0.027c-0.001,0.009-0.003,0.012-0.01,0.016
+  c-0.008,0.004-0.01,0.004-0.006,0.014c0.003,0.006,0.008,0.013,0.009,0.019c0.001,0.007,0.001,0.015,0.003,0.022
+  c0.004,0.017,0.012,0.034,0.02,0.049c0.005,0.008,0.014,0.031-0.004,0.019c-0.012-0.007-0.019-0.022-0.026-0.033
+  c-0.004-0.007-0.009-0.011-0.016-0.015c-0.006-0.003-0.013-0.005-0.019-0.009c-0.011-0.007-0.011-0.014-0.011-0.026
+  c0-0.007,0-0.015-0.008-0.019c-0.006-0.003-0.015-0.003-0.023-0.006c-0.005-0.002-0.011-0.004-0.015-0.007
+  c0.009,0.008,0.012,0.018,0.015,0.028c0.007,0.02,0.016,0.038,0.027,0.056c0.009,0.016,0.02,0.022,0.034,0.032
+  c0.011,0.008,0.022,0.024,0.029,0.035c0.008,0.01,0.015,0.019,0.024,0.028c0.009,0.009,0.019,0.015,0.025,0.027
+  c0.008,0.014,0.01,0.027,0.013,0.042c0.004,0.013,0.003,0.027,0.003,0.041c0,0.009,0.001,0.018-0.001,0.026
+  c0,0.003-0.002,0.005-0.002,0.008c-0.001,0.004,0,0.008,0,0.012c0,0.013,0,0.027,0,0.041c0,0.027,0.021,0.046,0.029,0.069
+  c0.008,0.023,0.006,0.053,0.005,0.079c-0.001,0.004-0.002,0.006-0.003,0.011c-0.002,0.005,0,0.009-0.001,0.014
+  c-0.001,0.005-0.003,0.008-0.004,0.012c0,0.003,0,0.006,0,0.008c0,0.004-0.003,0.004-0.004,0.007c-0.001,0.003,0,0.008,0,0.011
+  c-0.001,0.004-0.003,0.002-0.003,0.008c0.002,0.003,0.003,0.005,0.003,0.008c0.005,0.013,0.015,0.032,0.027,0.041
+  c0.005,0.003,0.012,0.004,0.019,0.004s0.013,0.005,0.018,0.012c0,0.002,0.001,0.004,0.001,0.006
+  c0.003,0.002,0.005,0.005,0.006,0.008c0.002,0.004,0.003,0.011,0.004,0.015c0.004,0.017,0.01,0.029,0.019,0.042
+  c0.011,0.015,0.021,0.018,0.039,0.019c0.016,0.001,0.029,0.009,0.042,0.02c0.006,0.005,0.011,0.013,0.018,0.018
+  c0.005,0.003,0.013,0.004,0.018,0.007c0.009,0.004,0.018,0.006,0.028,0.009c0.008,0.003,0.017,0.005,0.026,0.007
+  c0.007,0.001,0.015-0.001,0.023,0.001c0.007,0.002,0.014,0.006,0.022,0.006c0.005,0.001,0.018-0.002,0.022,0.001
+  c0.006,0.004,0.02,0.036,0.03,0.029c0.003-0.002,0.001-0.019,0.001-0.022c0-0.009,0.004-0.018,0.004-0.027
+  c0-0.005-0.001-0.01,0.001-0.015c0.001-0.004,0.003-0.006,0.003-0.011c-0.001-0.007-0.005-0.017-0.008-0.023
+  c-0.012-0.023,0.022-0.001,0.018-0.021c0-0.003-0.006-0.009-0.008-0.012c-0.002-0.005-0.003-0.001-0.002-0.009
+  c0.002-0.009,0.003-0.016,0.003-0.026c0-0.009,0-0.017-0.003-0.026c-0.003-0.007-0.009-0.013-0.011-0.02
+  c-0.004-0.011,0.006-0.019,0-0.029c-0.003-0.007-0.008-0.01-0.011-0.015c-0.004-0.006-0.004-0.016-0.005-0.023
+  c0-0.008-0.005-0.014-0.004-0.021c0.003,0.003,0.005,0.007,0.008,0.01c0.002,0.001,0.004,0.003,0.007,0.004
+  c0,0.002,0.001,0.004,0.001,0.006c0.003,0.005,0.011,0.019,0.019,0.016c0.011-0.002-0.009-0.032-0.013-0.037
+  c-0.008-0.01-0.017-0.018-0.023-0.03c-0.006-0.014-0.009-0.028-0.013-0.042c0.007,0.002,0.015,0.019,0.019,0.026
+  c0.005,0.007,0.012,0.012,0.017,0.02c0.009,0.013,0.017,0.029,0.023,0.044c0.002,0.006,0.001,0.013,0.005,0.019
+  c0.004,0.005,0.009,0.011,0.014,0.015c0.006,0.006,0.015,0.012,0.019,0.02c0.003,0.006,0.004,0.015,0.004,0.022
+  c0,0.005,0,0.01,0,0.015c0.001,0.004,0.002,0.005,0.003,0.008c0.005,0.018,0.017,0.031,0.025,0.049
+  c0.004,0.009,0.006,0.02,0.009,0.03c0.003,0.008,0.006,0.014,0.01,0.021c0.007,0.016,0.017,0.032,0.026,0.047
+  c0.005,0.008,0.007,0.017,0.01,0.026c0.003,0.008,0.008,0.017,0.008,0.025c-0.006-0.007-0.016-0.008-0.022-0.014
+  c-0.004-0.004-0.007-0.017-0.011-0.018c-0.007,0.022,0.013,0.046,0.022,0.064c0.006,0.013,0.012,0.028,0.017,0.041
+  c0.004,0.008,0.007,0.016,0.01,0.023c0.003,0.008,0.01,0.013,0.014,0.019c0.01,0.013,0.019,0.033,0.019,0.049
+  c0,0.015,0,0.03,0,0.045c0,0.015,0,0.033-0.008,0.045c-0.005,0.006-0.01,0.015-0.018,0.016c-0.006,0.001-0.017,0.001-0.023,0
+  s-0.009-0.004-0.015-0.004c-0.005,0-0.007,0.003-0.012,0.003c-0.006,0.001-0.01-0.003-0.018-0.003c-0.015,0-0.031,0-0.043,0.01
+  c-0.006,0.006-0.009,0.014-0.018,0.013c-0.004,0-0.004-0.003-0.007-0.004c-0.003-0.001-0.007,0-0.011-0.001
+  c-0.006-0.001-0.012-0.005-0.02-0.002c-0.008,0.003-0.01,0.016-0.016,0.021c-0.006,0.006-0.02,0.011-0.028,0.008
+  c-0.003-0.001-0.005-0.005-0.008-0.006c-0.004-0.002-0.008-0.001-0.012-0.001s-0.01-0.001-0.015,0
+  c-0.007,0.001-0.01,0.005-0.016,0.008c-0.009,0.004-0.016,0.003-0.026,0.003c-0.017,0-0.037,0.003-0.053-0.006
+  c-0.013-0.008-0.018-0.02-0.025-0.032c-0.007-0.015-0.009-0.032-0.023-0.042c-0.015-0.01-0.028-0.006-0.032,0.012
+  c-0.005-0.001-0.017-0.015-0.021-0.019c-0.005-0.009-0.007-0.02-0.008-0.03c0-0.007-0.003-0.012-0.004-0.02
+  c-0.001-0.009,0.003-0.013,0.004-0.021c0.002-0.012-0.006-0.022-0.004-0.035c0.001-0.008,0.004-0.013,0.004-0.022
+  c0-0.008-0.001-0.012-0.005-0.018c-0.006-0.012-0.012-0.023-0.017-0.035c-0.005-0.015-0.011-0.026-0.024-0.037
+  c-0.008-0.008-0.016-0.017-0.026-0.023c-0.007-0.005-0.014-0.008-0.02-0.015c-0.007-0.008-0.005-0.01-0.003-0.019
+  c0.002-0.011-0.008-0.014-0.012-0.022c-0.003-0.007,0-0.008,0.001-0.016c0.003-0.018-0.018-0.021-0.03-0.027
+  c-0.01-0.004-0.024-0.005-0.033-0.012c-0.006-0.004-0.01-0.011-0.016-0.014c0.001,0-0.009-0.003-0.009-0.003
+  c-0.003-0.001-0.006-0.001-0.01-0.002c-0.008-0.002-0.015-0.007-0.023-0.009c-0.008-0.003-0.014-0.004-0.022-0.005
+  c-0.006-0.001-0.01-0.005-0.015-0.007c-0.005-0.001-0.01-0.002-0.015-0.003c-0.008-0.003-0.015-0.007-0.023-0.009
+  c-0.008-0.002-0.015-0.005-0.023-0.007c-0.005-0.001-0.01,0-0.015,0c-0.005-0.001-0.008-0.002-0.012-0.003
+  c-0.021-0.005-0.042-0.003-0.063-0.005h-0.001c-0.006,0.002-0.01,0.003-0.016,0.004c-0.005,0-0.013-0.002-0.018,0
+  c-0.006,0.001-0.007,0.004-0.015,0.004c-0.005,0-0.01-0.001-0.015,0c-0.01,0-0.021,0.006-0.03,0.011
+  c-0.008,0.004-0.016,0.007-0.023,0.013c-0.004,0.004-0.01,0.011-0.011,0.017c-0.001,0.005,0,0.01-0.001,0.015
+  c-0.002,0.009-0.005,0.018-0.007,0.027c-0.001,0.005-0.002,0.018-0.008,0.022c-0.008,0.005-0.011-0.008-0.019,0
+  c-0.005,0.006-0.007,0.016-0.007,0.023c0.001,0.01,0.006,0.016,0.003,0.026c-0.002,0.008-0.001,0.015-0.004,0.023
+  c-0.002,0.008-0.004,0.014-0.002,0.023c0.002,0.007,0.002,0.016,0.006,0.023c0.005,0.009,0.015,0.018,0.022,0.027
+  c0.006,0.008,0.011,0.016,0.016,0.025c0.004,0.008,0.007,0.012,0.002,0.02c-0.004,0.007-0.013,0.008-0.02,0.01
+  c-0.009,0.002-0.014-0.001-0.022,0.005c-0.005,0.005-0.008,0.01-0.016,0.011c-0.007,0.001-0.013-0.001-0.019-0.004
+  c-0.004-0.003-0.012-0.01-0.016-0.011c-0.006-0.001-0.008,0.003-0.014,0.004c-0.004,0-0.008-0.001-0.011-0.001
+  c-0.01,0.001-0.017,0.008-0.023,0.016c-0.006,0.006-0.009,0.01-0.007,0.018c0.002,0.008,0.006,0.014,0.01,0.02
+  c0,0.001,0,0.001,0.001,0.002c0.01,0.006,0.019,0.013,0.028,0.02c0.026,0.02,0.046,0.051,0.068,0.076
+  c0.01,0.012,0.019,0.026,0.029,0.039c0.014,0.017,0.033,0.025,0.049,0.039c0.009,0.008,0.018,0.018,0.027,0.025
+  c0.011,0.008,0.028,0.01,0.039,0.018c0.012,0.009,0.02,0.013,0.036,0.018c0.013,0.004,0.025,0.011,0.036,0.019
+  c0.008,0.006,0.023,0.021,0.026,0.031c0.002,0.007,0.002,0.012,0.005,0.019c0.005,0.009,0.014,0.017,0.024,0.023
+  c0.015,0.009,0.027,0.016,0.036,0.033c0.006,0.014,0.01,0.029,0.012,0.045c0.012,0.002,0.02,0.009,0.032,0.006
+  c0.008-0.003,0.014-0.01,0.02-0.015c0.019-0.015,0.036-0.024,0.061-0.017c0.008,0.002,0.024,0.009,0.031,0.014
+  c0.009,0.007,0.011,0.02,0.017,0.03c0.004,0.009,0.007,0.019,0.013,0.028c0.009,0.013,0.021,0.024,0.033,0.035
+  c0.017,0.016,0.038,0.036,0.045,0.06c0.006,0.024-0.011,0.048-0.004,0.073c0.004,0.012,0.012,0.024,0.016,0.035
+  c0.005,0.01,0.007,0.019,0.012,0.029c0.005,0.011,0.005,0.021,0.007,0.033c0.002,0.009,0.011,0.019,0.011,0.03
+  c0.026,0,0.022-0.06,0.022-0.076c0-0.015,0-0.025-0.004-0.039s-0.009-0.019-0.017-0.03c-0.011-0.014-0.017-0.037-0.023-0.052
+  c-0.005-0.011-0.008-0.023-0.012-0.034c-0.005-0.012-0.011-0.022-0.017-0.034c-0.008-0.015-0.028-0.048-0.015-0.064
+  c0.016-0.019,0.042,0.004,0.053,0.017c0.012,0.015,0.024,0.024,0.034,0.041c0.007,0.014,0.014,0.026,0.02,0.04
+  c0.011,0.027,0.016,0.053,0.016,0.081c0,0.012,0.001,0.024,0,0.035c-0.001,0.015-0.006,0.021,0,0.036
+  c0.011,0.03,0.026,0.059,0.036,0.09c0.007,0.022,0.012,0.041,0.016,0.064c0.002,0.013,0.008,0.02,0.004,0.035
+  c-0.003,0.013-0.008,0.027-0.01,0.04c-0.001,0.006,0.001,0.012,0,0.017c-0.001,0.007-0.005,0.011-0.006,0.018
+  c-0.001,0.006,0.001,0.012,0.001,0.018c-0.001,0.008-0.005,0.014-0.007,0.022c-0.005,0.025-0.012,0.05-0.018,0.075
+  c-0.012,0.051-0.038,0.1-0.056,0.15c-0.006,0.014-0.006,0.024-0.006,0.039c0,0.013-0.004,0.031-0.001,0.042
+  c0.003,0.01,0.011,0.018,0.013,0.029c0.002,0.015,0.004,0.026,0.011,0.04c0.002,0.004,0.003,0.007,0.005,0.011
+  c0.002,0.002,0.004,0.006,0.006,0.009c0.101,0.09,0.202,0.179,0.302,0.269c0.157-0.083,0.314-0.165,0.471-0.247
+  c0.084,0.037,0.169,0.074,0.253,0.111c-0.052,0.135-0.104,0.271-0.156,0.406c0.008,0.013,0.01,0.03,0.014,0.044
+  c0.005,0.019,0.007,0.039,0.012,0.058c0.001,0.007,0.007,0.016,0.008,0.023c0.003,0.009,0.002,0.018,0.002,0.027
+  c0,0.01,0,0.019,0,0.028c0,0.008-0.005,0.017-0.006,0.024v-0.008l-0.004-0.001c-0.003-0.008,0.001-0.017-0.001-0.026
+  c-0.002-0.01-0.006-0.016-0.006-0.027c0.001-0.017,0.004-0.039,0.001-0.055c-0.004-0.013-0.012-0.026-0.016-0.039
+  c-0.002-0.009-0.005-0.018-0.008-0.026c-0.001-0.004-0.001-0.005-0.001-0.007c-0.008,0.021-0.017,0.042-0.025,0.063
+  c0.003,0.005,0.004,0.01,0.01,0.016c0.013,0.014,0.017,0.03,0.022,0.048c0.003,0.012,0.003,0.031,0,0.043
+  c-0.002,0.009-0.005,0.013-0.004,0.022c0,0.006,0.001,0.016,0,0.022c-0.003,0.01-0.019,0.028-0.029,0.031
+  c-0.012,0.004-0.026-0.005-0.033-0.015c-0.007-0.01-0.011-0.023-0.016-0.034c-0.004,0.01-0.008,0.021-0.012,0.031
+  c0.004,0.007,0.01,0.012,0.012,0.019c0.004,0.011,0.001,0.027,0.001,0.038s0.002,0.023,0.001,0.033
+  c-0.004,0.022-0.017,0.044-0.024,0.065c-0.007,0.024-0.013,0.045-0.022,0.068c-0.008,0.023-0.011,0.046-0.022,0.068
+  c-0.008,0.02-0.013,0.046-0.02,0.066c-0.006,0.018-0.012,0.039-0.02,0.055c-0.006,0.014-0.013,0.017-0.012,0.032
+  c0,0.011,0,0.022,0,0.032c0,0.022-0.005,0.041-0.011,0.061c-0.006,0.018-0.015,0.036-0.022,0.054
+  c-0.004,0.008-0.004,0.018-0.007,0.027c-0.001,0.006-0.004,0.009-0.004,0.016c0,0.005,0.002,0.012,0,0.017
+  c-0.003,0.012-0.01,0.024-0.011,0.038c-0.001,0.013-0.005,0.025-0.005,0.038c-0.001,0.011,0,0.022,0,0.032
+  c0,0.013,0.005,0.021,0.005,0.033c0.001,0.014-0.003,0.026-0.005,0.038c-0.001,0.004-0.004,0.01-0.004,0.012
+  c-0.001,0.006,0,0.011-0.001,0.016c-0.001,0.005-0.005,0.004-0.005,0.01c0,0.004,0.004,0.012,0.005,0.017
+  c0,0.013-0.004,0.02-0.006,0.032c-0.003,0.014,0,0.031,0,0.045s-0.007,0.024-0.01,0.037c-0.002,0.011-0.004,0.022-0.007,0.033
+  c-0.001,0.005,0.001,0.011,0.001,0.016c-0.001,0.005-0.004,0.008-0.005,0.012c-0.001,0.006-0.003,0.015-0.001,0.021
+  c0.001,0.005,0.005,0.005,0.006,0.01c0.002,0.01,0,0.023,0,0.033c0,0.014-0.004,0.025-0.006,0.039c-0.002,0.01,0,0.021,0,0.032
+  c0,0.009,0.002,0.013,0.004,0.022c0.001,0.004,0,0.013,0.002,0.016c0.006,0.008,0.023,0.001,0.031-0.001
+  c0.009-0.003,0.016-0.011,0.027-0.009c0.007,0.001,0.014,0.009,0.019,0.014c0.017,0.017,0.026,0.025,0.026,0.05
+  c0,0.011,0,0.022,0,0.033c0,0.016,0,0.017,0.016,0.016c0.014,0,0.021-0.001,0.028,0.011c0.004,0.009,0.005,0.019,0.016,0.022
+  c0.008,0.003,0.021,0.001,0.026-0.007c0.006-0.009-0.004-0.021,0.005-0.029c0.008,0.019,0,0.048-0.004,0.067
+  c-0.002,0.008-0.002,0.015-0.006,0.024c0,0-0.003,0.011-0.004,0.012c-0.002,0.01-0.001,0.021-0.006,0.031
+  c-0.005,0.01-0.011,0.019-0.015,0.028c-0.006,0.012-0.015,0.018-0.024,0.028c-0.005,0.006-0.014,0.017-0.016,0.025
+  c-0.003,0.01,0.004,0.02,0.005,0.029c0.003,0.014,0.005,0.019,0.002,0.034c-0.002,0.012-0.001,0.023-0.001,0.035
+  c0,0.015-0.006,0.025-0.011,0.039c-0.008,0.022-0.017,0.042-0.022,0.065c-0.002,0.009,0,0.016-0.004,0.026
+  c-0.002,0.006-0.005,0.012-0.008,0.018c-0.005,0.009-0.011,0.017-0.015,0.027c-0.008,0.018-0.009,0.038-0.02,0.056
+  c-0.003,0.004-0.009,0.009-0.013,0.013c-0.003,0.004-0.004,0.007-0.006,0.011c-0.009,0.012-0.017,0.027-0.026,0.04
+  c-0.008,0.01-0.021,0.02-0.032,0.028c-0.01,0.008-0.019,0.018-0.028,0.026c-0.009,0.007-0.017,0.018-0.027,0.023
+  c-0.012,0.006-0.018-0.001-0.024-0.012c-0.009-0.016-0.01-0.02-0.026-0.007c-0.006,0.005-0.013,0.01-0.017,0.017
+  c-0.005,0.007-0.005,0.015-0.008,0.023c-0.003,0.004-0.006,0.005-0.007,0.01c-0.003,0.01,0.001,0.023,0,0.033
+  c-0.001,0.011-0.005,0.021-0.006,0.032c0,0.015-0.004,0.027-0.005,0.041c-0.003,0.029-0.015,0.056-0.016,0.085
+  c-0.001,0.011-0.006,0.02-0.006,0.032c0,0.01,0.003,0.024,0.001,0.033c-0.003,0.01-0.008,0.014-0.017,0.018
+  c-0.002,0.001-0.015,0.004-0.016,0.005c-0.003,0.007,0.003,0.006,0.004,0.011c0.001,0.005,0,0.01,0.001,0.015
+  c0.002,0.011,0.009,0.021,0.006,0.033c-0.002,0.005-0.005,0.005-0.006,0.01s0,0.012,0,0.017c0,0.014,0,0.02-0.007,0.032
+  c-0.006,0.012-0.013,0.02-0.015,0.033c-0.001,0.012-0.004,0.027-0.01,0.037c-0.008,0.013-0.019,0.022-0.028,0.033
+  c-0.007,0.008-0.014,0.019-0.02,0.028c-0.007,0.011-0.016,0.017-0.023,0.027c-0.007,0.01-0.013,0.017-0.017,0.028
+  c-0.004,0.011-0.007,0.022-0.012,0.032c-0.012,0.024-0.023,0.054-0.03,0.081c-0.006,0.024-0.014,0.048-0.028,0.069
+  c-0.004,0.005-0.008,0.011-0.012,0.016c0,0.009,0,0.017,0.002,0.025c0.005,0.018,0.009,0.046,0.004,0.065
+  c-0.001,0.007-0.004,0.009-0.006,0.016c0,0.005,0.001,0.011,0.001,0.017c0,0.01,0.001,0.024-0.007,0.033
+  c-0.017,0.017-0.037-0.004-0.049-0.015c-0.017-0.016-0.034-0.033-0.048-0.051c-0.004-0.006-0.01-0.011-0.015-0.017
+  c-0.007-0.008-0.013-0.022-0.021-0.028c-0.015-0.011-0.04-0.001-0.046,0.018c-0.001,0.004,0,0.011-0.001,0.016
+  c-0.001,0.008-0.005,0.013-0.004,0.022c0.001,0.012,0.006,0.02,0.006,0.033c-0.001,0.013,0.002,0.024,0.005,0.037
+  c0.002,0.007,0.008,0.016,0.01,0.024c0.004,0.024,0.011,0.045,0.023,0.069c0.021,0.044,0.03,0.086,0.047,0.131
+  c0.004,0.01,0.011,0.021,0.013,0.032c0.001,0.011,0,0.023,0,0.033c0,0.022-0.006,0.045-0.015,0.065
+  c-0.017,0.039-0.036,0.073-0.073,0.097c-0.01,0.007-0.023,0.013-0.031,0.023c-0.008,0.011-0.012,0.024-0.023,0.033
+  c-0.018,0.015-0.028,0.027-0.038,0.049c-0.004,0.009-0.011,0.019-0.018,0.027c-0.004,0.005-0.01,0.008-0.014,0.012
+  c-0.002,0.003-0.002,0.008-0.005,0.011c-0.005,0.007-0.012,0.013-0.017,0.02c-0.007,0.01-0.011,0.023-0.018,0.032
+  c-0.007,0.009-0.019,0.016-0.021,0.028c-0.001,0.006,0.001,0.011-0.001,0.017c-0.002,0.006-0.004,0.009-0.004,0.016
+  c-0.001,0.011,0.001,0.018-0.011,0.022c-0.009,0.003-0.02,0.006-0.029,0.001c-0.007-0.005-0.011-0.015-0.014-0.023
+  c-0.001-0.002-0.002-0.004-0.003-0.005c-0.013-0.002-0.022-0.011-0.03-0.021c-0.011-0.013-0.027-0.035-0.031-0.051
+  c-0.002-0.005,0-0.01-0.003-0.014c-0.001-0.003-0.006-0.005-0.008-0.008c-0.005-0.006-0.005-0.014-0.007-0.021
+  c-0.007-0.019-0.005-0.04-0.01-0.059c-0.003-0.016-0.01-0.029-0.012-0.044c-0.003-0.021,0.005-0.039,0.006-0.06
+  c0-0.009-0.004-0.022-0.009-0.033c-0.02-0.01-0.041-0.018-0.062-0.021c-0.024-0.003-0.037-0.011-0.053,0.012
+  c-0.006,0.008-0.007,0.018-0.014,0.026c-0.006,0.006-0.014,0.011-0.02,0.017c-0.009,0.008-0.013,0.018-0.021,0.028
+  c-0.005,0.007-0.012,0.014-0.016,0.021c-0.006,0.012-0.006,0.024-0.007,0.037c0,0.011-0.003,0.021-0.005,0.032
+  c-0.002,0.019-0.01,0.034-0.011,0.053c-0.001,0.018-0.001,0.039-0.005,0.057c-0.006,0.026-0.028,0.05-0.041,0.073
+  c-0.008,0.014-0.014,0.033-0.03,0.041c-0.003,0.001-0.009,0.002-0.012,0.004c-0.001,0-0.002,0.001-0.003,0.001
+  c-0.175,0.457-0.35,0.913-0.525,1.37c0,0.001,0.001,0,0.001,0.002c0.002,0.013-0.004,0.021-0.006,0.032
+  c-0.002,0.011,0.003,0.023,0.001,0.033c-0.003,0.012-0.015,0.025-0.022,0.034c-0.007,0.007-0.013,0.013-0.02,0.02
+  c-0.047,0.122-0.094,0.245-0.141,0.367c0.116,0.027,0.232,0.055,0.348,0.082c0.005-0.004,0.01-0.008,0.015-0.012
+  c0.01-0.006,0.022-0.01,0.032-0.016c0.007-0.005,0.012-0.011,0.017-0.017c0.004-0.003,0.006-0.005,0.008-0.006
+  c0.001-0.002,0.002-0.004,0.003-0.006c0.006-0.009,0.012-0.014,0.02-0.022c0.012-0.013,0.027-0.024,0.04-0.036
+  c0.012-0.011,0.022-0.022,0.033-0.033c0.012-0.012,0.026-0.021,0.038-0.033c0.01-0.01,0.025-0.02,0.037-0.028
+  c0.007-0.005,0.013-0.009,0.017-0.016c0.001-0.001,0.001-0.001,0.002-0.002c0.008-0.012,0.017-0.023,0.025-0.035
+  c0.002-0.004,0.004-0.008,0.006-0.012c0.001-0.004,0.006-0.005,0.008-0.008c0.048-0.065,0.095-0.131,0.142-0.196
+  c0.009-0.017,0.022-0.036,0.027-0.053c0.004-0.012,0.004-0.021,0.012-0.032c0.009-0.011,0.021-0.022,0.032-0.033
+  c0.014-0.014,0.027-0.028,0.037-0.045c0.004-0.006,0.01-0.012,0.014-0.018c0.007-0.011,0.013-0.023,0.021-0.033
+  c0.004-0.007,0.016-0.03,0.027-0.029c0.003,0,0.001,0.004,0.002,0.005c0.131-0.182,0.262-0.363,0.393-0.544
+  c0.001-0.004-0.001-0.009,0.001-0.012c0.005-0.011,0.014-0.017,0.023-0.027c0.002-0.003,0.006-0.009,0.009-0.011
+  c0.001-0.001,0.003-0.001,0.004-0.002c0.019-0.026,0.038-0.053,0.057-0.079c0.002-0.005,0.006-0.009,0.006-0.015
+  c0.001-0.005-0.001-0.011,0-0.017c0.001-0.006,0.005-0.01,0.006-0.016c0.001-0.005-0.001-0.011-0.001-0.017
+  c0.001-0.003,0.005-0.01,0.005-0.011c0-0.008-0.001-0.008-0.003-0.016c-0.005-0.017,0.001-0.031,0.009-0.046
+  c0.007-0.013,0.022-0.048,0.043-0.034c0.007,0.005,0.005,0.015,0.013,0.019c0.008,0.005,0.021,0.001,0.027-0.002
+  c0.007-0.004,0.012-0.01,0.018-0.015c0.026-0.036,0.053-0.073,0.079-0.109c-0.007-0.001-0.015-0.002-0.022-0.003
+  c-0.01-0.002-0.022,0-0.032,0c-0.02,0-0.056,0.005-0.05-0.027l0.007-0.003c-0.001,0-0.002-0.001-0.002-0.001
+  c-0.006-0.003-0.014-0.006-0.016-0.012c-0.002-0.007,0.004-0.016,0.006-0.022c0.004-0.01,0.004-0.018,0.007-0.028
+  c0.009-0.032,0.037-0.059,0.042-0.092c0.001-0.007-0.001-0.014,0.001-0.022c0.002-0.007,0.004-0.014,0.006-0.022
+  c0.003-0.015,0.01-0.035,0.019-0.049c0.009-0.014,0.021-0.027,0.034-0.038c0.012-0.009,0.027-0.02,0.028-0.037
+  c0.007-0.002,0.013,0.001,0.02-0.002c0.004-0.001,0.013-0.007,0.018-0.01c0.008-0.004,0.017-0.021,0.025-0.021
+  c0.002,0.01,0.005,0.018,0.007,0.028c0.002,0.016,0.007,0.033,0.01,0.049c0.001,0.011,0.003,0.026,0.001,0.037
+  c-0.001,0.006-0.005,0.01-0.006,0.016c-0.001,0.007,0.001,0.015,0,0.022c-0.002,0.021-0.009,0.046-0.018,0.065
+  c-0.009,0.022-0.014,0.048-0.02,0.071c-0.003,0.014-0.009,0.025-0.014,0.038c0.102-0.037,0.204-0.075,0.305-0.112
+  c0.052,0.073,0.104,0.145,0.156,0.218c-0.134,0.131-0.269,0.263-0.404,0.394c0.001,0.002,0,0.004,0,0.006
+  c0.004,0.023,0.023,0.036,0.023,0.06c-0.001,0.013,0.003,0.031,0,0.044c-0.003,0.009-0.01,0.018-0.013,0.028
+  c-0.003,0.014-0.01,0.028-0.013,0.042c-0.003,0.012-0.002,0.026-0.002,0.038c0,0.026,0,0.05-0.005,0.075
+  c-0.003,0.014-0.006,0.025-0.006,0.04c0.001,0.014-0.002,0.024-0.005,0.038c-0.003,0.012-0.005,0.025-0.009,0.037
+  c-0.004,0.011-0.01,0.022-0.012,0.033c-0.001,0.005,0,0.011-0.002,0.016c-0.003,0.007-0.012,0.015-0.017,0.022
+  c-0.006,0.011-0.012,0.022-0.019,0.033c-0.007,0.012-0.008,0.027-0.016,0.039c-0.006,0.009-0.011,0.017-0.016,0.027
+  c-0.006,0.011-0.01,0.021-0.014,0.032c-0.004,0.013-0.011,0.018-0.019,0.027c-0.009,0.012-0.018,0.023-0.028,0.033
+  c-0.012,0.012-0.024,0.019-0.033,0.033c-0.011,0.017-0.019,0.033-0.026,0.05c-0.002,0.005-0.006,0.01-0.007,0.015
+  c-0.001,0.005,0.002,0.01-0.001,0.015c-0.003,0.008-0.014,0.014-0.02,0.019c-0.016,0.012-0.039,0.021-0.051,0.037
+  c-0.007,0.009-0.014,0.017-0.02,0.027c-0.005,0.008-0.009,0.016-0.017,0.022c-0.007,0.005-0.018,0.007-0.027,0.009
+  c-0.006,0.002-0.01,0.001-0.016,0.002c-0.006,0-0.008,0.003-0.012,0.004c-0.023,0.005-0.046-0.007-0.06,0.016
+  c-0.01,0.015-0.021,0.031-0.03,0.046c-0.017,0.029-0.048,0.047-0.071,0.071c-0.017,0.019-0.027,0.039-0.05,0.052
+  c-0.005,0.003-0.008,0.002-0.013,0.005c-0.002,0.002-0.005,0.006-0.008,0.008c-0.006,0.007-0.012,0.012-0.016,0.021
+  c-0.014,0.027-0.025,0.057-0.035,0.086c-0.005,0.013-0.022,0.029-0.032,0.039c-0.01,0.011-0.021,0.019-0.028,0.033
+  c-0.005,0.009-0.008,0.019-0.014,0.028c-0.012,0.021-0.023,0.042-0.035,0.063c-0.011,0.018-0.016,0.042-0.026,0.061
+  c-0.009,0.019-0.022,0.037-0.033,0.054c-0.02,0.033-0.029,0.072-0.047,0.105c-0.011,0.02-0.021,0.036-0.035,0.053
+  c-0.017,0.02-0.014,0.044-0.028,0.064c-0.012,0.018-0.026,0.033-0.035,0.052c-0.009,0.018-0.014,0.035-0.025,0.052
+  c-0.011,0.019-0.03,0.032-0.041,0.051c-0.01,0.017-0.02,0.035-0.028,0.053c-0.009,0.021-0.024,0.036-0.037,0.055
+  c-0.005,0.008-0.011,0.013-0.016,0.021c-0.007,0.012-0.016,0.017-0.025,0.026c-0.009,0.01-0.015,0.021-0.027,0.028
+  c-0.007,0.004-0.013,0.005-0.019,0.013c-0.006,0.008-0.008,0.018-0.013,0.025c-0.005,0.006-0.012,0.011-0.016,0.017
+  c-0.009,0.01-0.016,0.022-0.026,0.029c-0.009,0.006-0.018,0.01-0.026,0.016c-0.02,0.016-0.025,0.002-0.041-0.011
+  c-0.01-0.007-0.022-0.013-0.033-0.019c-0.012-0.005-0.025-0.009-0.037-0.014c-0.01-0.005-0.015-0.011-0.027-0.011
+  c-0.013-0.001-0.024,0.002-0.036,0.005c-0.008,0.002-0.019,0.005-0.03,0.006c-0.017,0.01-0.028,0.021-0.043,0.033
+  c-0.005,0.003-0.01,0.007-0.016,0.009c-0.013,0.004-0.026,0.007-0.039,0.012c-0.008,0.004-0.018,0.006-0.027,0.011
+  c-0.008,0.004-0.015,0.01-0.022,0.015c-0.019,0.011-0.041,0.017-0.058,0.03c-0.015,0.011-0.028,0.021-0.044,0.03
+  c-0.016,0.008-0.033,0.014-0.05,0.022c-0.013,0.007-0.022,0.018-0.034,0.027c-0.005,0.004-0.006,0.001-0.011,0.006
+  c-0.003,0.003-0.006,0.009-0.009,0.013c-0.009,0.01-0.013,0.022-0.022,0.034c-0.017,0.024-0.036,0.05-0.058,0.068
+  c-0.018,0.014-0.028,0.031-0.038,0.05c-0.012,0.024-0.033,0.039-0.056,0.052c-0.019,0.01-0.042,0.025-0.053,0.045
+  c-0.007,0.01-0.018,0.023-0.022,0.034c-0.004,0.009-0.004,0.021-0.008,0.031c-0.008,0.022-0.027,0.034-0.044,0.047
+  c-0.021,0.018-0.039,0.04-0.057,0.062c-0.014,0.017-0.036,0.028-0.055,0.037c-0.004-0.008,0.01-0.019,0.014-0.026
+  c0.006-0.011,0.017-0.026,0.012-0.038c-0.009,0.002-0.019,0.011-0.027,0.016c-0.01,0.006-0.016,0.007-0.027,0.011
+  c-0.014,0.003-0.027,0.017-0.036,0.028c-0.015,0.016-0.027,0.027-0.045,0.038c-0.016,0.01-0.029,0.023-0.045,0.03
+  c-0.014,0.007-0.023,0.018-0.037,0.025c-0.018,0.008-0.032,0.021-0.049,0.03c-0.021,0.01-0.039,0.026-0.06,0.035
+  c-0.016,0.007-0.032,0.013-0.048,0.022c-0.017,0.01-0.032,0.02-0.05,0.03c-0.007,0.004-0.011,0.004-0.018,0.011
+  c-0.004,0.004-0.008,0.01-0.013,0.013c-0.01,0.008-0.022,0.016-0.033,0.022c-0.007,0.004-0.015,0.008-0.023,0.011
+  c-0.006,0.003-0.011,0.002-0.017,0.004c-0.003,0-0.005,0.002-0.006,0.004c-0.023,0.001-0.002-0.026,0.005-0.037
+  c0.005-0.007,0.011-0.012,0.013-0.021c0.001-0.009-0.004-0.019,0.001-0.027c0.002-0.005,0.01-0.008,0.013-0.013
+  c0.005-0.005,0.01-0.013,0.013-0.02c0.009-0.018,0.016-0.036,0.033-0.05c0.01-0.008,0.024-0.01,0.034-0.019
+  c0.007-0.008,0.011-0.019,0.02-0.025c0.007-0.006,0.016-0.008,0.023-0.013c0.008-0.007,0.012-0.021,0.014-0.029
+  c0.002-0.008-0.001-0.015,0.002-0.022c0.002-0.006,0.01-0.012,0.014-0.017c0.008-0.009,0.015-0.018,0.022-0.027
+  c0.016-0.019,0.03-0.037,0.04-0.059c0.01-0.02,0.021-0.037,0.033-0.055c0.007-0.009,0.014-0.018,0.021-0.027
+  c0.005-0.008,0.017-0.02,0.02-0.028c0.005-0.012,0.002-0.03,0.002-0.043c-0.001-0.019-0.005-0.024-0.022-0.028
+  c-0.013-0.004-0.017-0.008-0.026-0.017c-0.005-0.004-0.009-0.003-0.013-0.004c-0.344,0.335-0.687,0.671-1.031,1.006
+  c-0.061-0.042-0.122-0.085-0.183-0.128c-0.002,0.003-0.005,0.006-0.006,0.009c-0.013,0.031-0.044,0.08-0.08,0.087
+  c-0.008,0.002-0.009,0.001-0.017,0.006c-0.005,0.003-0.01,0.008-0.016,0.01c-0.009,0.002-0.025,0.003-0.033-0.003
+  c-0.003-0.003-0.005-0.006-0.005-0.01c-0.002,0.003-0.003,0.005-0.004,0.007c-0.007,0.014-0.02,0.029-0.023,0.045
+  c-0.004,0.02,0.003,0.034-0.007,0.053c-0.007,0.012-0.012,0.026-0.019,0.039c-0.004,0.008-0.005,0.013-0.007,0.022
+  c-0.002,0.01-0.004,0.012-0.011,0.02c-0.009,0.012-0.018,0.023-0.032,0.031c-0.015,0.008-0.036,0.005-0.049-0.002l0.003-0.007
+  c-0.002,0.001-0.005,0.002-0.008,0.001c-0.009-0.004-0.006-0.017-0.005-0.024c0.002-0.01,0.006-0.025,0.011-0.034
+  c0.006-0.011,0.016-0.017,0.022-0.027c0.002-0.004,0.007-0.01,0.008-0.014c0.003-0.008,0-0.017,0.003-0.026
+  c0.002-0.011,0.005-0.01,0-0.021c-0.004-0.01-0.01-0.018-0.014-0.027c-0.007-0.017,0.005-0.023,0.007-0.039
+  c0.001-0.01-0.001-0.012,0.005-0.022c0.005-0.007,0.009-0.012,0.013-0.02c0.005-0.014,0.007-0.026,0.025-0.029
+  c0.002,0,0.006,0,0.01,0c0-0.018,0.007-0.037,0.017-0.049c0.013-0.015,0.03-0.028,0.034-0.048c0.001-0.011-0.001-0.023-0.001-0.033
+  c0-0.005,0.002-0.009,0.003-0.014c-0.001-0.002-0.002-0.004-0.004-0.006c-0.344-0.241-0.689-0.482-1.033-0.722
+  c0.006-0.039,0.013-0.079,0.02-0.118c-0.014,0-0.028,0-0.041,0c-0.009,0-0.022,0.003-0.027-0.006
+  c-0.005-0.01,0.009-0.026,0.014-0.033c0.006-0.009,0.008-0.017,0.013-0.027c0.004-0.007,0.01-0.013,0.014-0.021
+  c0.006-0.01,0.01-0.02,0.014-0.031c0.002-0.005,0.004-0.006,0.004-0.012c0.001-0.008,0-0.014,0.001-0.021
+  c0.002-0.008,0.009-0.018,0.014-0.025c0.008-0.009,0.009-0.014,0.012-0.025c0.005-0.018,0.014-0.041,0.023-0.059
+  c0.001-0.001,0.003-0.002,0.004-0.003c0.012-0.068,0.023-0.137,0.035-0.205c-0.176-0.03-0.352-0.06-0.528-0.09
+  c0.067-0.179,0.135-0.359,0.203-0.538c-0.089-0.116-0.178-0.231-0.267-0.346c0.037-0.043,0.074-0.086,0.111-0.128
+  c-0.005-0.007-0.01-0.013-0.017-0.018c-0.204,0.031-0.408,0.062-0.612,0.094c-0.004-0.042,0.013,0.467-0.012-0.127
+  c-0.024-0.594,0.79-0.564,1.185-0.846c-0.005-0.014-0.01-0.028-0.014-0.042c-0.008-0.025-0.013-0.053-0.025-0.077
+  c-0.011-0.024-0.02-0.049-0.036-0.07c-0.014-0.017-0.036-0.032-0.039-0.054c-0.003-0.02,0.009-0.039,0.015-0.056
+  c0.008-0.018,0.028-0.026,0.045-0.035c0.009-0.005,0.019-0.007,0.027-0.014c0.009-0.008,0.01-0.015,0.015-0.026
+  c0.007-0.013,0.018-0.02,0.011-0.037c-0.001-0.003-0.006-0.008-0.008-0.012c-0.003-0.005-0.004-0.011-0.007-0.016
+  c-0.011-0.019-0.012-0.04-0.032-0.055c-0.02-0.014-0.04-0.028-0.06-0.042c-0.02-0.012-0.033-0.031-0.055-0.039
+  c-0.022-0.008-0.042-0.035-0.043-0.06c-0.001-0.011,0-0.022,0-0.033c0-0.014,0.003-0.024,0.005-0.038
+  c0.002-0.01-0.002-0.022,0.001-0.032c0.003-0.009,0.013-0.017,0.019-0.023c0.014-0.013,0.024-0.027,0.034-0.04
+  c-0.145-0.072-0.29-0.143-0.435-0.215c-0.005,0.005-0.011,0.01-0.012,0.016c-0.006-0.001-0.015-0.021-0.02-0.028
+  c-0.002-0.003-0.005-0.005-0.008-0.007c-0.101-0.05-0.203-0.101-0.304-0.151c-0.032-0.038-0.064-0.077-0.097-0.116
+  c-0.011-0.005-0.018-0.016-0.032-0.019c-0.013-0.003-0.019,0-0.029-0.01c-0.011-0.012-0.013-0.024-0.031-0.028
+  c-0.008-0.002-0.009,0.001-0.016-0.005c-0.006-0.004-0.013-0.012-0.018-0.017c-0.009-0.007-0.016-0.01-0.026-0.016
+  c-0.009-0.005-0.011-0.011-0.018-0.02c-0.003-0.005-0.006-0.008-0.01-0.011c-0.006-0.004-0.016-0.004-0.021-0.008
+  c-0.009-0.007-0.011-0.021-0.02-0.028c-0.007-0.004-0.014-0.005-0.019-0.013c-0.004-0.005-0.005-0.014-0.01-0.018
+  c-0.006-0.006-0.01-0.003-0.016-0.006c-0.014-0.006-0.011-0.023-0.02-0.033c-0.01-0.01-0.018-0.006-0.029-0.011
+  c-0.011-0.003-0.025-0.022-0.032-0.031c-0.015-0.022-0.04-0.033-0.055-0.055c-0.01-0.012-0.017-0.021-0.029-0.032
+  c-0.015-0.014-0.02-0.03-0.031-0.047c-0.007-0.01-0.017-0.018-0.021-0.03c-0.004-0.014,0.004-0.024,0.005-0.038
+  c0.001-0.025,0.01-0.045-0.002-0.069c-0.005-0.011,0.002-0.018,0.005-0.026c-0.059-0.071-0.118-0.142-0.177-0.214
+  c0.011-0.004,0.023-0.008,0.034-0.012l0.051-0.034c-0.007-0.015-0.015-0.032-0.006-0.049c0.007-0.011,0.017-0.026,0.025-0.037
+  c0.009-0.01,0.024-0.015,0.033-0.025c0.025-0.026,0.023-0.063,0.024-0.098c-0.252-0.022-0.504-0.045-0.755-0.067
+  c0.009-0.109,0.019-0.218,0.029-0.327c-0.002-0.001-0.004-0.003-0.006-0.005c-0.009-0.01-0.017-0.015-0.023-0.027
+  c-0.007-0.017-0.001-0.038,0.018-0.045c0.006-0.003,0.012,0.001,0.018,0.002c0.004-0.051,0.009-0.102,0.013-0.154
+  c-0.005-0.003-0.01-0.006-0.015-0.011c-0.009-0.01-0.015-0.019-0.027-0.027c-0.011-0.006-0.017-0.01-0.023-0.021
+  c-0.006-0.01-0.006-0.017-0.006-0.028c0-0.007-0.001-0.015,0-0.021c0.002-0.008,0.01-0.014,0.011-0.022
+  c0.001-0.009-0.009-0.02-0.016-0.026c-0.003-0.002-0.013-0.01-0.016-0.011c-0.005-0.002-0.012,0.001-0.016-0.002
+  c-0.021-0.015,0.031-0.046-0.012-0.054c-0.007-0.001-0.01,0.003-0.015-0.004c-0.002-0.003-0.004-0.018-0.005-0.021
+  c-0.003-0.015-0.001-0.031-0.001-0.046c0-0.016,0.002-0.034,0-0.049c-0.001-0.009-0.005-0.016-0.006-0.025
+  c-0.001-0.01,0-0.02,0-0.03c0-0.031,0.013-0.066,0.004-0.097c-0.006-0.025-0.003-0.05,0.003-0.076
+  c0.006-0.022,0.01-0.042,0.015-0.065c0.007-0.028,0.009-0.058,0.027-0.081c0.011-0.014,0.02-0.037,0.038-0.039
+  c0.017-0.001,0.018,0,0.026-0.016c0.008-0.015,0.007-0.027,0.007-0.044c0-0.022-0.001-0.044,0.004-0.065
+  c0.003-0.011,0.003-0.022,0.006-0.032c0.003-0.012,0.001-0.026,0.001-0.038c0-0.022-0.005-0.043-0.006-0.065
+  c0-0.013,0-0.026,0-0.039V49.35c0-0.013-0.001-0.028,0.002-0.041c0.001-0.005,0.003-0.007,0.004-0.013c0.001-0.005,0-0.011,0-0.017
+  c0-0.01-0.001-0.021,0-0.032c0-0.012,0.006-0.024,0.009-0.034c0.004-0.01,0.007-0.022,0.014-0.03
+  c0.007-0.009,0.015-0.007,0.026-0.007c0.009,0,0.024-0.001,0.031-0.007c0.012-0.009,0.006-0.019,0.003-0.031
+  c-0.003-0.011,0-0.022-0.001-0.033c-0.001-0.012-0.003-0.013,0.01-0.02c0.022-0.011,0.042-0.019,0.066-0.024
+  c0.012-0.002,0.022,0.002,0.032,0.005c0.011,0.003,0.022,0.001,0.033,0.001c0.011,0,0.022-0.001,0.033,0
+  c0.012,0.002,0.019,0.006,0.032,0.006c0.011,0,0.022,0,0.033,0c0.01-0.001,0.018,0.002,0.027,0.004
+  c0.007-0.002,0.014-0.004,0.022-0.005c0.012,0,0.026-0.001,0.038,0c0.011,0.002,0.016,0.006,0.027,0.006c0.011,0,0.022,0,0.033,0
+  c0.01,0,0.023,0.002,0.032,0c0.007-0.001,0.011-0.005,0.017-0.006c0.007-0.001,0.015,0.001,0.022,0.001
+  c0.019,0,0.046-0.005,0.065-0.001c0.005,0.001,0.006,0.005,0.01,0.006c0.007,0.002,0.018,0.002,0.026,0.004
+  c0.015,0.004,0.022,0.012,0.035,0.022c0.016,0.013,0.027,0.036,0.043,0.046c0.008,0.006,0.018,0.009,0.027,0.014
+  c0.014,0.007,0.024,0.01,0.038,0.013c0.008,0.002,0.008,0.006,0.016,0.003c0.002,0,0.01-0.008,0.012-0.009
+  c0.007-0.006,0.014-0.011,0.02-0.018c0.006-0.006,0.011-0.011,0.018-0.015c0.01-0.007,0.02-0.005,0.032-0.007
+  c0.009-0.001,0.019-0.007,0.028-0.008c0.007-0.001,0.014,0,0.02-0.001c0.012-0.002,0.022-0.009,0.034-0.006
+  c0.025,0.005,0.044,0.035,0.065,0.048c0.011,0.006,0.022,0.013,0.033,0.018c0.01,0.004,0.02,0.005,0.029,0.009
+  c0.009,0.004,0.016,0.008,0.024,0.014c0.015,0.01,0.032,0.011,0.049,0.016c0.023,0.006,0.055,0.022,0.071,0.038
+  c0.004,0.004,0.012,0.015,0.013,0.02c0,0.006-0.005,0.012-0.006,0.017c-0.002,0.007-0.005,0.014-0.006,0.021
+  c-0.004,0.019,0.02,0.048,0.033,0.059c0.013,0.012,0.028,0.026,0.043,0.034c0.002,0.001,0.01,0.003,0.013,0.004
+  c0.004,0.002,0.007,0.004,0.01,0.005c0.012,0.006,0.018,0.009,0.016,0.024c-0.003,0.013-0.009,0.014-0.017,0.021
+  c-0.007,0.007-0.012,0.017-0.016,0.028c-0.014,0.038-0.022,0.074-0.022,0.115c0,0.014,0.003,0.034,0,0.048
+  c-0.001,0.004-0.002,0.008-0.003,0.012c0.022,0.011,0.043,0.022,0.065,0.033c0.094-0.079,0.189-0.158,0.283-0.238
+  c-0.269-0.352-0.538-0.704-0.807-1.056c-0.004,0.003-0.008,0.006-0.014,0.006c-0.005,0.001-0.007,0.002-0.012,0.003
+  c-0.004,0.001-0.01,0.001-0.014,0c-0.022-0.005-0.047-0.009-0.067-0.019c-0.027-0.013-0.052-0.029-0.075-0.047
+  c-0.025-0.02-0.045-0.05-0.05-0.081c-0.003-0.019,0.003-0.037-0.006-0.054c-0.007-0.012-0.014-0.022-0.019-0.035
+  c-0.006-0.017,0.002-0.037,0.01-0.052c0.004-0.008,0.009-0.016,0.009-0.026c-0.001-0.004-0.002-0.007-0.002-0.011
+  c-0.062-0.08-0.124-0.161-0.186-0.242c0.389-1.261,1.079-1.084,1.742-0.555c0.001,0,0.002,0.001,0.003,0.001
+  c0.005,0,0.012-0.002,0.017-0.001c0.005,0.002,0.006,0.006,0.011,0.007c0.01,0.002,0.024,0,0.035,0s0.024-0.002,0.034-0.001
+  c0.013,0.002,0.021,0.006,0.035,0.006s0.027,0.001,0.041,0.006c0.009,0.003,0.019,0.01,0.028,0.012
+  c0.015,0.003,0.021-0.007,0.023,0.011c0.002,0.013,0.001,0.028-0.004,0.041c-0.008,0.019-0.013,0.035-0.013,0.057
+  c0,0.012-0.004,0.018-0.006,0.029c0,0.001,0,0.002,0,0.004c0.057,0.051,0.114,0.106,0.17,0.161c0.032,0.011,0.064,0.026,0.1,0.018
+  c0.005-0.001,0.005-0.005,0.012-0.005c0.007,0.001,0.013,0.005,0.018,0.008c0.012,0.006,0.015,0.01,0.029,0.01
+  c0.011,0,0.023,0,0.034,0c0.006,0,0.012-0.001,0.018,0c0.008,0.001,0.01,0.004,0.017,0.006c0.012,0.004,0.022,0.007,0.035,0.013
+  c0.01,0.005,0.019,0.01,0.028,0.016c0.02,0.011,0.043,0.018,0.064,0.028c0.035,0.018,0.058,0.054,0.086,0.08
+  c0.003,0.002,0.008,0.007,0.01,0.008c0.003,0.002,0.01,0.004,0.012,0.006c0.007,0.006,0.013,0.021,0.018,0.029
+  c0.005,0.01,0.008,0.019,0.007,0.031c-0.002,0.02-0.011,0.047-0.019,0.065c-0.004,0.008-0.013,0.015-0.018,0.022
+  c-0.004,0.007-0.007,0.016-0.011,0.023c-0.005,0.008-0.012,0.015-0.018,0.023c-0.005,0.008-0.009,0.018-0.014,0.026
+  c-0.002,0.004-0.005,0.007-0.007,0.01c0.042,0.045,0.084,0.091,0.124,0.136c0.006-0.006,0.013-0.013,0.02-0.016
+  c0.008-0.004,0.026-0.013,0.035-0.011c0.007,0.002,0.013,0.012,0.019,0.017c0.013,0.013,0.025,0.025,0.034,0.041
+  c0.008,0.013,0.01,0.027,0.018,0.04c0.004,0.007,0.007,0.015,0.011,0.024c0.012,0.026,0.032,0.046,0.049,0.069
+  c0.014,0.018,0.011,0.04,0.016,0.061c0.295,0.327,0.516,0.558,0.595,0.478c0.083-0.331,0.166-0.663,0.248-0.995
+  c0.021-0.028,0.042-0.057,0.063-0.085c-0.002-0.004-0.004-0.008-0.004-0.012c-0.001-0.012-0.002-0.029,0.001-0.041
+  c0.002-0.007,0.007-0.014,0.009-0.022c0.004-0.012,0.006-0.013,0.013-0.024c0.013-0.017,0.023-0.034,0.039-0.05
+  c0.015-0.016,0.035-0.03,0.057-0.04c0.002-0.005,0-0.01,0.002-0.02c0.001-0.006,0.005-0.01,0.006-0.017
+  c0.001-0.005-0.002-0.012,0-0.017c0.006-0.02,0.037-0.028,0.052-0.039c0.01-0.007,0.018-0.016,0.029-0.023
+  c0.01-0.007,0.02-0.012,0.031-0.018c0.038-0.053,0.077-0.106,0.116-0.159c0.014-0.002,0.029-0.003,0.044-0.004
+  c0.003-0.008,0.004-0.017,0.009-0.024c0.005-0.008,0.014-0.013,0.02-0.02c0.018-0.019,0.024-0.044,0.041-0.064
+  c0.005-0.006,0.013-0.011,0.017-0.018c0.006-0.01,0.008-0.024,0.011-0.035c0.003-0.009,0.009-0.019,0.011-0.028
+  c0.003-0.013-0.003-0.028,0.001-0.041c0.006-0.022,0.032-0.043,0.055-0.039c0.005,0.001,0.018,0.009,0.024,0.012
+  c0.012,0.005,0.024,0.01,0.035,0.017c0.038,0.023,0.05,0.063,0.071,0.101c0.009,0.018,0.023,0.034,0.031,0.053
+  c0.009,0.019,0.015,0.035,0.031,0.051c0,0,0,0.001,0.001,0.001c0.067-0.006,0.133-0.012,0.2-0.018c0-0.006,0.001-0.011,0.001-0.016
+  c-0.001-0.007-0.005-0.011-0.007-0.018c-0.001-0.005,0-0.013-0.001-0.018c-0.003-0.016-0.01-0.03-0.016-0.045
+  c-0.009-0.026-0.027-0.049-0.036-0.075c-0.009-0.026-0.021-0.058-0.016-0.087c0.004-0.018,0.009-0.014,0.023-0.017
+  c0.015-0.002,0.026-0.006,0.041-0.006c0.011,0,0.024,0.002,0.034,0.001c0.006-0.001,0.012-0.005,0.017-0.006
+  c0.014-0.005,0.022-0.004,0.036-0.002c0.014,0.002,0.029,0.002,0.044,0.002c0.016-0.001,0.028,0.003,0.043,0.006
+  c0.012,0.001,0.027-0.001,0.039-0.001c0.015,0,0.026,0.006,0.041,0.006c0.023,0,0.046-0.001,0.069,0.005
+  c0.012,0.003,0.024,0.006,0.036,0.007c0.018,0.001,0.034,0.009,0.052,0.012c0.022,0.002,0.048,0,0.067-0.007
+  c0.01-0.003,0.015-0.003,0.022-0.012c0.003-0.005,0.005-0.009,0.005-0.013c-0.02-0.016-0.041-0.03-0.057-0.05
+  c-0.016-0.022-0.029-0.044-0.04-0.069c-0.003-0.008-0.003-0.015-0.006-0.023c-0.001-0.005-0.004-0.009-0.006-0.015
+  c-0.002-0.01-0.004-0.02-0.004-0.031c0-0.019,0.003-0.043-0.003-0.06c-0.007-0.019-0.018-0.027-0.036-0.016
+  c-0.007,0.005-0.009,0.005-0.018,0.005c-0.008,0-0.015-0.001-0.023-0.004c-0.01-0.004-0.013-0.017-0.018-0.026
+  c-0.005-0.009-0.01-0.019-0.016-0.027c-0.011-0.014-0.031-0.005-0.044-0.015c-0.013-0.011-0.018-0.03-0.026-0.045
+  c-0.004-0.007-0.009-0.016-0.013-0.023c-0.003-0.004-0.008-0.007-0.011-0.011c-0.004-0.005-0.005-0.01-0.008-0.015
+  c-0.002-0.003-0.004-0.005-0.006-0.007c-0.009-0.003-0.018-0.008-0.028-0.013c-0.029-0.016-0.059-0.038-0.082-0.062
+  c-0.013-0.014-0.029-0.025-0.042-0.039c-0.008-0.008-0.016-0.018-0.023-0.027c-0.012-0.016-0.02-0.035-0.03-0.052
+  c-0.005-0.008-0.014-0.015-0.019-0.024c-0.004-0.007-0.007-0.012-0.011-0.019c-0.008-0.011-0.016-0.024-0.02-0.037
+  c-0.004-0.012-0.011-0.025-0.011-0.038c0-0.007,0-0.012,0.008-0.015c0.009-0.003,0.025,0.011,0.031,0.018
+  c0.006,0.007,0.008,0.017,0.014,0.024s0.013,0.012,0.018,0.02c0.005,0.007,0.008,0.012,0.016,0.017
+  c0.006,0.003,0.013,0.004,0.018,0.009c0.007,0.006,0.015,0.016,0.02,0.023c0.005,0.007,0.009,0.015,0.016,0.007
+  c0.005-0.005,0.006-0.015,0.011-0.019c0.004-0.004,0.013-0.009,0.019-0.008c0.006,0,0.01,0.008,0.015,0.011
+  c0.004,0.001,0.019,0.002,0.022,0.001c0.011-0.005-0.01-0.025-0.014-0.032c-0.008-0.015-0.014-0.032-0.021-0.048
+  c-0.005-0.014-0.005-0.029-0.01-0.041c-0.006-0.017-0.008-0.034-0.016-0.049c-0.004-0.008-0.007-0.016-0.012-0.023
+  c-0.004-0.008-0.011-0.013-0.017-0.019c-0.009-0.009-0.018-0.018-0.027-0.027c-0.009-0.008-0.02-0.014-0.03-0.022
+  c-0.014-0.011-0.025-0.024-0.038-0.035c-0.004-0.004-0.008-0.006-0.011-0.011c-0.002-0.001-0.004-0.005-0.005-0.007
+  c-0.004-0.007-0.007-0.011-0.013-0.016c-0.003-0.003-0.012-0.009-0.008-0.014c0.002-0.003,0.016,0.004,0.021,0.003
+  c-0.005-0.004-0.012-0.007-0.017-0.011c-0.008-0.006-0.014-0.013-0.021-0.02c-0.006-0.006-0.014-0.012-0.021-0.019
+  c-0.003-0.003-0.004-0.006-0.008-0.009c-0.003-0.002-0.005-0.003-0.008-0.004c-0.004-0.003-0.008-0.009-0.011-0.013
+  c-0.005-0.006-0.008-0.012-0.012-0.019c-0.008-0.013-0.017-0.027-0.03-0.036c-0.013-0.01-0.026-0.02-0.035-0.035
+  c-0.006-0.012-0.009-0.026-0.014-0.038c-0.007-0.014-0.027-0.015-0.038-0.025c-0.008-0.008-0.013-0.02-0.022-0.028
+  c-0.017-0.015-0.038-0.031-0.06-0.037c-0.009-0.003-0.013-0.003-0.019-0.012c-0.003-0.005-0.004-0.015-0.012-0.018
+  c-0.012-0.005-0.023,0.017-0.034,0c-0.003-0.006-0.004-0.014-0.007-0.02c-0.003-0.004-0.008-0.01-0.012-0.014
+  c-0.011-0.009-0.025-0.017-0.037-0.023c-0.021-0.011-0.047-0.007-0.067-0.016c-0.014-0.006-0.033-0.01-0.047-0.015
+  c-0.014-0.004-0.02-0.01-0.031-0.021c-0.01-0.011-0.025-0.019-0.034-0.031c-0.01-0.015-0.017-0.028-0.033-0.038
+  c-0.015-0.01-0.031-0.02-0.046-0.03c-0.004-0.002-0.005,0-0.008-0.004c-0.003-0.003-0.003-0.008-0.006-0.012
+  c-0.004-0.007-0.011-0.012-0.019-0.015c-0.011-0.003-0.02-0.009-0.027-0.018c-0.004-0.008-0.01-0.012-0.015-0.019
+  c-0.01-0.015-0.016-0.031-0.026-0.046c-0.009-0.012-0.018-0.022-0.028-0.033c-0.005-0.005-0.011-0.009-0.018-0.011
+  c-0.008-0.004-0.016-0.008-0.024-0.012c-0.01-0.005-0.021-0.008-0.032-0.016c-0.008-0.006-0.015-0.012-0.023-0.018
+  c-0.015-0.01-0.029-0.021-0.041-0.034c-0.009-0.01-0.015-0.017-0.027-0.023c-0.007-0.003-0.015-0.003-0.023-0.005
+  c-0.011-0.002-0.021-0.006-0.031-0.01c-0.01,0.004-0.02,0.008-0.031,0.009c-0.01,0.002-0.015,0.001-0.024,0.008
+  c-0.01,0.008-0.019,0.022-0.022,0.035c-0.004,0.019,0.006,0.031,0.012,0.048c0.013,0.034,0.016,0.069-0.027,0.074
+  c0,0.01-0.009,0.017-0.011,0.025c-0.002,0.01,0.001,0.022,0,0.032c-0.001,0.022-0.028,0.033-0.047,0.037
+  c-0.007,0.002-0.016,0.001-0.023,0c-0.007,0-0.011-0.003-0.016-0.004c-0.004-0.001-0.01,0-0.014-0.001
+  c-0.005-0.001-0.006-0.005-0.01-0.006c-0.005-0.001-0.01,0.001-0.015-0.001c-0.002,0-0.008-0.004-0.011-0.005
+  c-0.009-0.004-0.017-0.01-0.026-0.016c-0.009-0.005-0.018-0.011-0.028-0.016c-0.005-0.002-0.009-0.005-0.014-0.009
+  c-0.003-0.002-0.008-0.004-0.011-0.006c-0.016-0.012-0.025-0.032-0.036-0.048c-0.018-0.024-0.04-0.013-0.065-0.009
+  c-0.005,0.001-0.01-0.001-0.016,0c-0.005,0.001-0.009,0.004-0.015,0.006c-0.008,0.001-0.017-0.002-0.025-0.001
+  c-0.01,0.001-0.018,0.005-0.027,0.006c-0.018,0.001-0.036-0.003-0.053,0.001c-0.017,0.003-0.033,0.007-0.05,0.009
+  c-0.006,0.001-0.012,0-0.018,0.001c-0.004,0.001-0.006,0.004-0.012,0.005c-0.005,0-0.011-0.002-0.016-0.001
+  c-0.005,0.001-0.005,0.005-0.01,0.006c-0.007,0.001-0.014-0.002-0.021-0.001c-0.006,0.002-0.01,0.005-0.016,0.006
+  c-0.011,0.002-0.02,0.003-0.032,0.006c-0.012,0.004-0.018,0.004-0.031,0.003c-0.019-0.001-0.032,0.006-0.048,0.016
+  c-0.022,0.014-0.04,0.037-0.068,0.038c-0.011,0-0.016-0.004-0.026-0.005c-0.012-0.002-0.021,0-0.032,0.004
+  c-0.014,0.004-0.028,0.007-0.042,0.01c-0.012,0.003-0.025,0.006-0.037,0.007c-0.028,0.002-0.055,0.009-0.082,0.016
+  c-0.022,0.005-0.044,0.01-0.065,0.014c-0.015,0.003-0.029,0.009-0.043,0.012c-0.024,0.005-0.054,0-0.078,0
+  c-0.021,0-0.04,0-0.054-0.015c-0.01-0.009-0.02-0.026-0.024-0.039c-0.002-0.006-0.002-0.01-0.005-0.016
+  c-0.002-0.003-0.006-0.006-0.008-0.009c-0.007-0.009-0.011-0.021-0.016-0.032c-0.011-0.022-0.012-0.039,0.007-0.058
+  c0.009-0.009,0.017-0.014,0.022-0.026c0.004-0.008,0.006-0.017,0.01-0.025c0.009-0.017,0.018-0.033,0.03-0.05
+  c0.019-0.03-0.027-0.017-0.041-0.014c-0.021,0.004-0.037-0.007-0.046-0.023c-0.009-0.015-0.019-0.029-0.032-0.042
+  c-0.007-0.007-0.014-0.01-0.021-0.016c-0.007-0.005-0.011-0.013-0.018-0.018c-0.019-0.013-0.038-0.025-0.057-0.038
+  c-0.01-0.007-0.016-0.016-0.025-0.023c-0.008-0.006-0.016-0.012-0.024-0.018c-0.013-0.01-0.024-0.021-0.036-0.033
+  c-0.017-0.015-0.036-0.023-0.056-0.033c-0.018-0.009-0.035-0.024-0.054-0.03c-0.024-0.008-0.047-0.018-0.068-0.033
+  c-0.005-0.003-0.01-0.006-0.015-0.01c-0.009,0.006-0.018,0.012-0.026,0.017c-0.013,0.007-0.019,0.007-0.033,0.01
+  c-0.012,0.002-0.019,0.005-0.031,0.005c-0.018,0-0.036,0.002-0.053,0.001c-0.021-0.002-0.038-0.008-0.059-0.005
+  c-0.024,0.004-0.049,0.009-0.073,0.01c-0.023,0-0.046,0-0.068,0c-0.013,0-0.025-0.002-0.038-0.001
+  c-0.014,0.001-0.026,0.006-0.04,0.006c-0.029,0-0.057-0.015-0.086-0.016c-0.01,0-0.021,0-0.031,0c-0.017,0-0.03,0.004-0.046,0.005
+  c-0.02,0.002-0.04,0.009-0.06,0.011c-0.011,0.002-0.024,0-0.036,0h-0.069c-0.01,0-0.021,0-0.031,0c-0.011,0-0.016-0.004-0.027-0.006
+  c-0.012-0.001-0.014,0.001-0.021-0.01c-0.006-0.011-0.003-0.02-0.014-0.028c-0.012-0.009-0.029-0.013-0.043-0.018
+  c-0.019-0.007-0.039-0.012-0.058-0.018c-0.007-0.003-0.015-0.007-0.021-0.008c-0.009-0.003-0.018,0-0.027-0.001
+  c-0.009-0.002-0.017-0.005-0.026-0.006c-0.012-0.001-0.025-0.003-0.036-0.006c-0.014-0.004-0.029-0.009-0.043-0.01
+  c-0.007,0-0.015,0.002-0.021,0.001c-0.014-0.003-0.027-0.011-0.042-0.011c-0.007-0.001-0.014,0.001-0.022,0
+  c-0.008-0.001-0.012-0.004-0.02-0.006c-0.017-0.002-0.032-0.002-0.048-0.009c-0.018-0.007-0.033-0.016-0.053-0.017
+  c-0.021-0.002-0.046,0.005-0.067,0c-0.007-0.001-0.014-0.004-0.021-0.006c-0.005-0.002-0.011-0.003-0.017-0.005
+  c-0.006-0.002-0.01-0.007-0.015-0.01c-0.007-0.003-0.014-0.007-0.021-0.01c-0.026-0.013-0.051-0.024-0.075-0.041
+  c-0.011-0.008-0.021-0.019-0.031-0.029c-0.006-0.006-0.028-0.023-0.016-0.03l0.011-0.011c-0.01-0.002-0.023-0.029-0.017-0.036
+  c0.004-0.004,0.022-0.006,0.027-0.006c0.009-0.001,0.018,0,0.027,0c0.016,0,0.036,0.003,0.052,0
+  c0.008-0.001,0.016-0.008,0.022-0.009c0.009-0.003,0.017-0.001,0.025-0.001c0.022-0.001,0.038-0.017,0.059-0.016
+  c0.022,0,0.032-0.006,0.046-0.023c0.006-0.007,0.011-0.016,0.015-0.025c0.004-0.007,0.011-0.014,0.013-0.021
+  c0.002-0.008-0.002-0.018-0.001-0.026c0.002-0.01,0.006-0.016,0.005-0.026c0-0.004,0-0.008,0.001-0.011
+  c-0.001-0.005-0.004-0.008-0.005-0.012c-0.002-0.01,0-0.016-0.006-0.026c-0.006-0.012-0.014-0.023-0.02-0.036
+  c-0.003-0.008-0.006-0.014-0.01-0.021c-0.009-0.013-0.016-0.027-0.024-0.041c-0.006-0.011-0.017-0.025-0.02-0.038
+  c-0.008-0.032,0.022-0.019,0.041-0.015c0.009,0.001,0.018,0.004,0.028,0.005c0.003,0,0.007,0,0.01,0
+  c0.006,0,0.008,0.003,0.012,0.004c0.032,0.008,0.064,0.018,0.093,0.032c0.006-0.022-0.001-0.041-0.019-0.054
+  c-0.009-0.006-0.019-0.01-0.028-0.015c-0.011-0.007-0.019-0.017-0.026-0.027c-0.014-0.021-0.021-0.047-0.021-0.072
+  c0-0.012-0.004-0.02-0.006-0.031c-0.002-0.014,0.006-0.025,0.006-0.038c-0.001-0.015-0.009-0.033-0.006-0.047
+  c0.002-0.009,0.01-0.016,0.011-0.026c0.001-0.005,0-0.011,0-0.016c0-0.007,0.003-0.009,0.004-0.016c0.001-0.003,0-0.013,0.002-0.015
+  c0.004-0.003,0.015,0,0.02,0c0.015-0.002,0.011-0.008,0.011-0.022V43.87c0-0.023-0.001-0.043,0.026-0.042
+  c0.012,0,0.02,0.001,0.032,0.004c0.011,0.003,0.025,0.001,0.037,0.001s0.024-0.001,0.037,0c0.015,0.001,0.028,0.007,0.043,0.011
+  c0.023,0.006,0.05,0.011,0.071,0.022c0.007,0.004,0.02,0.005,0.023,0.014c0.004,0.013-0.004,0.027-0.006,0.038
+  c-0.002,0.012,0.002,0.024-0.001,0.036c-0.003,0.01-0.004,0.019-0.008,0.028c-0.009,0.019-0.021,0.038-0.002,0.057
+  c0.01,0.009,0.025,0.01,0.036,0.016c0.011,0.006,0.022,0.009,0.033,0.014c0.008,0.003,0.015,0.006,0.021,0.011
+  c0.004,0.003,0.007,0.005,0.011,0.01s0.007,0.011,0.011,0.016c0.011,0.012,0.044,0.036,0.059,0.017
+  c0.01-0.013-0.027-0.049-0.038-0.058c-0.008-0.006-0.014-0.015-0.022-0.02c-0.006-0.005-0.009-0.006-0.015-0.012
+  c-0.006-0.008-0.011-0.015-0.011-0.026c0-0.012,0.006-0.017,0.012-0.026c0.002-0.004,0.007-0.012,0.008-0.016
+  c0.001-0.005,0.004-0.013,0.005-0.017c0.005-0.027-0.005-0.037-0.02-0.057c-0.008-0.01-0.013-0.021-0.021-0.031
+  c-0.005-0.008-0.01-0.012-0.015-0.021c-0.004-0.007-0.006-0.015-0.011-0.022c-0.008-0.01-0.014-0.023-0.022-0.033
+  c-0.01-0.011-0.024-0.021-0.037-0.03c-0.024-0.015-0.04-0.036-0.059-0.056c-0.012-0.015-0.021-0.031-0.034-0.045
+  c-0.007-0.008-0.015-0.019-0.012-0.031c0.003-0.014,0.024-0.024,0.037-0.026c0.008-0.001,0.015,0.001,0.023,0
+  c0.007-0.001,0.013-0.004,0.02-0.005c0.013-0.003,0.028,0.002,0.041,0.004c0.01,0.002,0.022,0,0.032,0.002
+  c0.013,0.004,0.023,0.003,0.037,0.004c0.024,0.002,0.033,0.015,0.049,0.031c0.015,0.014,0.032,0.025,0.051,0.033
+  c0.022,0.008,0.041,0.001,0.063,0.005c0.009,0.001,0.02,0.008,0.028,0.009c0.011,0.003,0.023,0.001,0.036,0.001
+  c0.01,0.001,0.018,0.005,0.026,0.012c0.009,0.009,0.008,0.013,0.011,0.024c0.003,0.007,0.01,0.016,0.014,0.023
+  c0.006,0.01,0.006,0.02,0.013,0.031c0.009,0.015,0.021,0.028,0.03,0.042c0.006,0.009,0.011,0.021,0.017,0.03
+  c0.009,0.013,0.022,0.022,0.032,0.033c0.014,0.016,0.03,0.03,0.046,0.042c0.019,0.013,0.041,0.018,0.058,0.032
+  c0.012,0.009,0.025,0.016,0.037,0.025c0.019,0.014,0.024,0.039,0.042,0.055c0.008,0.007,0.018,0.013,0.025,0.021
+  c0.006,0.008,0.014,0.018,0.023,0.024c0.014,0.009,0.027,0.003,0.042,0.006c0.009,0.002,0.02,0.009,0.03,0.012
+  c0.019,0.008,0.034,0.026,0.054,0.035c0.022,0.01,0.049,0.017,0.073,0.017c0.012-0.001,0.02,0.004,0.032,0.005
+  c0.017,0.001,0.032-0.005,0.049-0.006c0.01,0,0.025-0.001,0.035,0c0.012,0.002,0.019,0.006,0.032,0.006
+  c0.012,0,0.02,0.003,0.031,0.005c0.005,0.002,0.011-0.001,0.016,0c0.009,0.001,0.009,0.002,0.016,0.007
+  c0.007,0.004,0.014,0.01,0.021,0.014c0.008,0.005,0.017,0.007,0.026,0.011c0.011,0.004,0.021,0.003,0.032,0.006
+  c0.013,0.004,0.024,0.012,0.032,0.021c0.003-0.001,0.007-0.003,0.01-0.005c0.024-0.012,0.043-0.023,0.054-0.049
+  c0.009-0.019,0.003-0.044-0.007-0.063c-0.009-0.018-0.038-0.035-0.036-0.058c0.003-0.021,0.03-0.027,0.031-0.047
+  c0.001-0.009,0.002-0.023,0-0.032s-0.011-0.023-0.015-0.031c-0.005-0.008-0.011-0.012-0.015-0.02
+  c-0.004-0.006-0.005-0.014-0.008-0.02c-0.005-0.01-0.009-0.019-0.013-0.029c-0.004-0.008-0.009-0.019-0.011-0.027
+  c-0.001-0.005,0-0.01-0.002-0.015c-0.003-0.006-0.011-0.01-0.016-0.014c-0.017-0.014-0.03-0.026-0.042-0.044
+  c-0.006-0.009-0.013-0.017-0.019-0.026c-0.007-0.011-0.016-0.015-0.028-0.021c-0.019-0.011-0.035-0.021-0.056-0.028
+  c-0.003-0.001-0.009-0.003-0.012-0.004c-0.001,0-0.011-0.004-0.012-0.004c-0.011-0.002-0.023-0.001-0.035-0.001
+  c-0.01,0-0.023,0.003-0.032,0c-0.011-0.002-0.013-0.016-0.016-0.026c-0.005-0.021-0.002-0.048-0.022-0.062
+  c-0.018-0.014-0.038-0.02-0.057-0.032c-0.017-0.01-0.03-0.028-0.047-0.039c-0.032-0.022-0.095-0.042-0.095-0.088
+  c0-0.008,0.003-0.014,0.004-0.022c0.002-0.006,0-0.013,0.001-0.019c0.002-0.011,0.007-0.022,0.01-0.033
+  c0.002-0.008,0.002-0.013,0.006-0.021s0.01-0.018,0.015-0.025c0.009-0.016,0.02-0.029,0.032-0.041
+  c-0.009-0.008-0.018-0.015-0.027-0.023c-0.015-0.014-0.039-0.026-0.058-0.034c-0.014-0.006-0.026-0.014-0.041-0.021
+  c-0.017-0.007-0.046-0.021-0.052-0.04c-0.003-0.008-0.005-0.019-0.006-0.027c0-0.012,0.003-0.021-0.004-0.031
+  c-0.006-0.008-0.016-0.014-0.021-0.023c-0.002-0.004-0.002-0.01-0.005-0.015c-0.002-0.004-0.005-0.005-0.007-0.009
+  c-0.004-0.015-0.002-0.044,0-0.059c0.003-0.016,0.011-0.03,0.011-0.047c0-0.021-0.001-0.036-0.009-0.054
+  c-0.009-0.018-0.015-0.038-0.023-0.056c-0.011-0.024-0.029-0.045-0.047-0.064c-0.03-0.032-0.062-0.064-0.088-0.1
+  c-0.012-0.016-0.026-0.032-0.037-0.048c-0.011-0.017-0.019-0.038-0.033-0.052c-0.006-0.006-0.014-0.007-0.02-0.011
+  c-0.006-0.005-0.013-0.014-0.018-0.02c-0.007-0.01-0.024-0.035-0.019-0.047c0.007,0.003,0.018,0.008,0.026,0.005
+  c0.011-0.005,0.003-0.014,0-0.021c-0.002-0.004-0.003-0.009-0.004-0.012c-0.002-0.005-0.005-0.011-0.008-0.015
+  c-0.006-0.01-0.013-0.023-0.021-0.031c-0.013-0.014-0.025-0.027-0.034-0.043c-0.003-0.004-0.013-0.015-0.013-0.021
+  c0.001-0.009,0.015-0.012,0.022-0.016c0.011-0.006,0.03-0.02,0.025-0.035c-0.002-0.006-0.011-0.016-0.016-0.021
+  c-0.008-0.008-0.023-0.008-0.029-0.018c-0.004-0.007-0.004-0.018-0.007-0.025c-0.004-0.012-0.005-0.02-0.005-0.032
+  c0-0.01-0.002-0.019,0.004-0.028s0.014-0.011,0.022-0.015c0.014-0.007,0.036-0.02,0.02-0.035c-0.012-0.012-0.031-0.015-0.046-0.022
+  c-0.019-0.009-0.042-0.015-0.063-0.021c-0.014-0.004-0.029-0.004-0.042-0.007c-0.013-0.002-0.027-0.01-0.038-0.013
+  c-0.019-0.005-0.04,0.001-0.058-0.005c-0.009-0.003-0.018-0.007-0.026-0.011c-0.013-0.005-0.023-0.005-0.036-0.007
+  c-0.012-0.003-0.025-0.008-0.037-0.011c-0.01-0.003-0.021-0.007-0.032-0.01c-0.01-0.002-0.02-0.005-0.031-0.005
+  c-0.013,0.001-0.024-0.004-0.037-0.005c-0.007,0-0.025-0.003-0.031-0.006c-0.011-0.008-0.006-0.014,0.005-0.015
+  c0.01-0.001,0.02,0.002,0.03-0.001c0.007-0.002,0.013-0.01,0.022-0.011c-0.001-0.005-0.019-0.015-0.025-0.018
+  c-0.011-0.007-0.02-0.007-0.032-0.007c-0.011,0-0.022,0-0.032,0c-0.005,0-0.011,0.001-0.016,0c-0.008,0-0.013-0.004-0.021-0.005
+  c-0.011-0.002-0.021-0.003-0.032-0.005c-0.005-0.002-0.009-0.004-0.015-0.006c-0.009-0.002-0.02,0-0.03-0.003
+  c-0.014-0.005-0.024-0.006-0.039-0.007c-0.013-0.001-0.023-0.006-0.037-0.005c-0.011,0-0.02-0.004-0.031-0.006
+  c-0.012-0.001-0.025-0.003-0.036-0.006c-0.009-0.003-0.017-0.008-0.027-0.009c-0.007-0.001-0.01-0.003-0.016-0.005
+  c-0.008-0.001-0.014,0-0.021-0.001c-0.011-0.001-0.016-0.005-0.027-0.005s-0.021,0.001-0.03-0.007c-0.01-0.008-0.006-0.013,0-0.023
+  c0.006-0.01,0.009-0.016,0.009-0.028c0-0.022,0.001-0.042-0.004-0.063c-0.001-0.006,0-0.01-0.001-0.016s-0.004-0.01-0.005-0.016
+  c-0.002-0.009,0.002-0.02,0.011-0.025c0.005-0.003,0.01,0,0.015-0.001c0.006-0.001,0.01-0.005,0.016-0.006
+  c0.011-0.002,0.02,0,0.031-0.005c0.011-0.004,0.023-0.006,0.033-0.011c0.012-0.006,0.032-0.01,0.041-0.019
+  c0.02-0.018-0.012-0.029-0.022-0.042c-0.019-0.022-0.022-0.037-0.016-0.065c0.002-0.01,0.009-0.02,0.006-0.031
+  c-0.003-0.007-0.007-0.014-0.011-0.021c-0.716-0.167-1.463-0.256-2.23-0.256c-1.483,0-2.888,0.331-4.147,0.923
+  c-0.001,0.002-0.003,0.003-0.004,0.004c-0.011,0.007-0.019,0.017-0.021,0.029c-0.001,0.003-0.001,0.007-0.001,0.011
+  c0.689-0.188,1.378-0.376,2.067-0.564c0.028,0.121,0.055,0.242,0.083,0.363c-0.41,0.599-0.395,1.249-1.229,1.798
+  c-0.743,0.488-0.665,0.181-0.862,0.139c0,0,0,0,0,0.001c0.002,0.009,0.006,0.021,0.003,0.031c-0.002,0.006-0.008,0.015-0.012,0.021
+  c-0.004,0.007-0.01,0.015-0.014,0.022c-0.003,0.006-0.006,0.009-0.01,0.014c-0.001,0.001-0.047,0.052-0.11,0.123
+  c-0.002,0.008-0.005,0.017-0.007,0.025c0.052-0.057,0.09-0.098,0.089-0.095c-0.008,0.019-0.015,0.038-0.025,0.057
+  c-0.011,0.021-0.027,0.038-0.044,0.055c-0.011,0.01-0.022,0.021-0.032,0.031c-0.161,0.768,0.008,1.628-0.821,2.21
+  c-0.58,0.408-0.637,0.248-0.658,0.049c-0.037,0.163-0.024,0.083-0.004-0.031c-0.01-0.112-0.018-0.228-0.106-0.255
+  c-0.007-0.017-0.014-0.034-0.021-0.051c-0.001,0-0.002,0-0.003,0c-0.004,0-0.007,0.003-0.011,0.004
+  c-0.006,0.001-0.012-0.001-0.018,0c-0.009,0.003-0.017,0.003-0.025,0.006c-0.008,0.002-0.014,0.005-0.022,0.009
+  c-0.017,0.008-0.028-0.011-0.028-0.026c0-0.007,0-0.015,0-0.022c0-0.009,0.002-0.011,0.007-0.018
+  c0.003-0.005,0.005-0.011,0.004-0.018c-0.001-0.003-0.004-0.003-0.004-0.006c-0.001-0.005,0.002-0.009-0.003-0.012
+  c0.004-0.006,0.006-0.014,0.009-0.021c0.004-0.007,0.005-0.019,0.011-0.025c-0.016,0.001-0.03,0.01-0.043,0.018
+  c-0.008,0.005-0.015,0.009-0.024,0.012c-0.01,0.002-0.018,0.007-0.028,0.01c-0.023,0.009-0.044,0.022-0.066,0.032
+  c-0.016,0.006-0.03,0.011-0.046,0.018c-0.018,0.01-0.036,0.019-0.053,0.029c-0.016,0.008-0.028,0.024-0.047,0.024
+  c-0.012,0-0.02-0.003-0.031-0.008c-0.01-0.004-0.019-0.006-0.028-0.013c0,0,0.001,0,0.002,0h0.007
+  c-0.006-0.001-0.014-0.007-0.018-0.011c-0.006-0.006-0.002-0.014,0.001-0.021c0.01-0.023,0.03-0.038,0.045-0.057
+  c0.005-0.006,0.009-0.013,0.014-0.019c0.005-0.008,0.012-0.011,0.018-0.018c0.004-0.004,0.008-0.008,0.012-0.013
+  c0.006-0.006,0.014-0.007,0.02-0.012c0.014-0.011,0.025-0.022,0.036-0.035c0.008-0.01,0.017-0.017,0.025-0.026
+  c0.005-0.007,0.013-0.011,0.018-0.017c0.003-0.005,0.007-0.01,0.009-0.014c0.002-0.005,0.001-0.008,0.003-0.012
+  c0-0.003,0.003-0.003,0.003-0.006c0.001-0.004-0.002-0.007,0.001-0.011c0,0,0.006-0.002,0.007-0.003
+  c0.005-0.003,0.012-0.008,0.016-0.012c0.008-0.009,0.014-0.021,0.019-0.032c0.003-0.006,0.004-0.013,0.006-0.018
+  c0.004-0.008,0.01-0.014,0.013-0.021c0.006-0.015,0.013-0.03,0.026-0.041c-0.101-0.249-0.203-0.497-0.304-0.746
+  c0,0-0.001,0-0.001-0.001c-0.014-0.013-0.029-0.014-0.046-0.004c-0.017,0.012-0.022-0.004-0.038-0.007
+  c-0.008-0.001-0.014,0-0.021,0.004c-0.002,0.002-0.004,0.004-0.006,0.005c-0.002,0.001-0.007,0.003-0.009,0.004
+  c-0.006,0.006-0.007,0.015-0.015,0.02c-0.009,0.006-0.01,0.002-0.017-0.002c-0.016-0.008-0.031,0.007-0.042,0.017
+  c-0.009,0.008-0.018,0.016-0.03,0.016c-0.01,0.001-0.012,0-0.019,0.005c-0.004,0.003-0.012,0.011-0.017,0.012
+  c-0.003,0-0.019-0.005-0.021-0.008c-0.008,0.003-0.016,0.007-0.024,0.01c-0.003,0.001-0.008,0.005-0.011,0.005
+  c-0.006,0.001-0.007-0.003-0.012-0.003c-0.005,0-0.014,0.008-0.019,0.01c-0.005,0.003-0.011,0.006-0.017,0.008
+  s-0.021,0.003-0.024,0.008c-0.001-0.01,0.005-0.015,0.009-0.023c0.005-0.009,0.007-0.019,0.012-0.028
+  c0.005-0.009,0.008-0.019,0.012-0.028c0.002-0.006,0.005-0.013,0.007-0.019c0.002-0.005,0.005-0.009,0.008-0.013
+  c0.001-0.004,0-0.008,0.001-0.012c0.003-0.011,0.011-0.02,0.014-0.031c0.003-0.01,0.007-0.019,0.009-0.028
+  c0.001-0.005,0.003-0.012,0.004-0.017c0.001-0.003,0.004-0.004,0.004-0.007c0.001-0.008-0.005-0.009-0.003-0.018
+  c0.001-0.006,0.008-0.012,0.007-0.018c-0.008-0.003-0.011,0.009-0.019,0.007c-0.003-0.008,0.006-0.022,0.008-0.03
+  c0.002-0.008,0.007-0.016,0.01-0.024c-0.011-0.005-0.014,0.007-0.023,0.007c-0.005,0.001-0.013-0.007-0.012-0.012
+  c0-0.003,0.004-0.006,0.005-0.008c0.005-0.008,0.014-0.015,0.018-0.024c0.004-0.009,0.006-0.019,0.01-0.028
+  c0.003-0.006,0.008-0.01,0.01-0.016c0.002-0.004,0.002-0.008,0.004-0.012c0.004-0.007,0.011-0.015,0.017-0.021
+  c0.012-0.011,0.026-0.024,0.04-0.034c0.01-0.008,0.017-0.012,0.021-0.025c0.003-0.009,0.004-0.019,0.007-0.028
+  c0.005-0.017,0.019-0.032,0.028-0.047c0-0.001,0.001-0.002,0.001-0.002c-0.01-0.024-0.019-0.048-0.029-0.071
+  c-0.012,0.003-0.024,0.007-0.036,0.009c-0.033,0.003-0.06,0.027-0.089,0.043c-0.021,0.011-0.04,0.022-0.058,0.038
+  c-0.009,0.007-0.016,0.016-0.025,0.022c-0.009,0.006-0.016,0.013-0.024,0.02c-0.007,0.005-0.012,0.013-0.019,0.021
+  c-0.009,0.01-0.018,0.019-0.029,0.027c-0.005,0.004-0.01,0.01-0.015,0.013c-0.008,0.005-0.018,0.01-0.025,0.016
+  c-0.004,0.004-0.002,0.006-0.004,0.011c-0.002,0.006-0.01,0.012-0.014,0.016c-0.012,0.014-0.026,0.022-0.041,0.032
+  c-0.006,0.004-0.017,0.009-0.021,0.015c-0.002,0.002-0.002,0.006-0.004,0.008c-0.003,0.003-0.007,0.004-0.01,0.006
+  c-0.011,0.008-0.015,0.022-0.025,0.031c-0.006,0.005-0.012,0.009-0.016,0.016c0.001-0.002-0.003,0.01-0.003,0.009
+  c-0.001,0.003,0,0.007-0.001,0.011c-0.002,0.012-0.013,0.03-0.023,0.037c-0.006,0.005-0.01,0.005-0.014,0.014
+  c-0.004,0.009-0.002,0.019-0.01,0.028c-0.008,0.01-0.016,0.019-0.025,0.029c-0.004,0.006-0.008,0.013-0.015,0.015
+  c-0.002-0.004,0-0.008,0.002-0.011c-0.007,0.003-0.007,0.012-0.015,0.017c-0.006,0.003-0.015,0.006-0.02,0.011
+  c-0.004,0.005-0.007,0.017,0,0.02c0.009,0.003,0.012-0.009,0.02-0.001c0.002,0.003-0.001,0.007,0.003,0.01
+  c0.005,0.003,0.003,0.001,0.009-0.001c0.006-0.001,0.011-0.008,0.016-0.009c0.008-0.001,0.011,0.008,0.016,0.011
+  c0.004,0.004,0.009,0.006,0.013,0.008c0.005,0.003,0.004,0.002,0.007,0.005c0.001,0.001,0.004,0.005,0.005,0.007
+  c0.003,0.004,0.007,0.007,0.01,0.01c0.005,0.006,0.006,0.009,0.013,0.014c0.003,0.002,0.01,0.007,0.012,0.009
+  c0.006,0.007,0.003,0.008,0,0.016c-0.001,0.003-0.001,0.006-0.003,0.009c-0.001,0.001-0.003,0.003-0.004,0.004
+  c-0.002,0.002-0.002,0.006-0.004,0.008c-0.001,0.001-0.003,0.003-0.004,0.004c-0.002,0.003-0.006,0.007-0.005,0.011
+  c0,0.002,0.001,0.004,0.003,0.005c0.003,0.014,0.009,0.025,0.009,0.039c0,0.015,0,0.028-0.015,0.037
+  c-0.006,0.004-0.013,0.002-0.02,0.004c-0.004,0.001-0.008,0.006-0.013,0.007c-0.008,0.002-0.012-0.001-0.02,0.004
+  c-0.007,0.004-0.011,0.004-0.02,0.004c-0.008,0-0.013,0-0.02-0.004c-0.007-0.004-0.008-0.005-0.016,0
+  c-0.012,0.007-0.022,0.015-0.035,0.021c-0.013,0.005-0.024,0.009-0.037,0.015c-0.004,0.002-0.008,0.004-0.012,0.007
+  c-0.008,0.004-0.01,0.007-0.015,0.013c-0.006,0.006-0.015,0.009-0.021,0.015c-0.006,0.007-0.009,0.016-0.015,0.022
+  c-0.012,0.01-0.029,0.006-0.039,0.016c-0.011,0.01-0.018,0.023-0.03,0.033c-0.005,0.005-0.01,0.006-0.015,0.009
+  c-0.005,0.004-0.008,0.007-0.013,0.012c-0.009,0.01-0.015,0.009-0.027,0.013c-0.006,0.002-0.01,0.008-0.015,0.012
+  c-0.012,0.012-0.02,0.025-0.03,0.038c-0.01,0.013-0.019,0.024-0.028,0.037c-0.004,0.007-0.006,0.011-0.007,0.019
+  c-0.001,0.003-0.003,0.005-0.004,0.009c0,0.004,0.001,0.008,0,0.012c-0.001,0.006-0.004,0.01-0.004,0.016
+  c0,0.004,0.001,0.007-0.001,0.011c-0.003,0.006-0.009,0.007-0.015,0.01c-0.016,0.007-0.024,0.01-0.032,0.027
+  c-0.003,0.008-0.007,0.016-0.012,0.024c-0.005,0.007-0.01,0.009-0.017,0.015c-0.006,0.005-0.007,0.011-0.011,0.017
+  c-0.004,0.004-0.01,0.008-0.014,0.013c-0.008,0.008-0.011,0.019-0.014,0.03c0.157,0.008,0.315,0.015,0.472,0.023
+  c0.297,0.375,0.594,0.75,0.891,1.125c-0.013,0.092-0.025,0.183-0.038,0.275c-0.505,0.161-1.213-0.164-1.514,0.484
+  c-0.301,0.649-0.023,0.006-0.022,0.016c0,0.005,0.006,0.009,0.007,0.013c0.002,0.005,0.001,0.01,0.001,0.015
+  c0,0.013-0.003,0.029,0.005,0.039c0.007,0.008,0.013,0.016,0.019,0.025c0.007,0.01,0.613,0.002,0.019,0.032
+  c-0.594,0.03,0.013,0.021,0.002,0.036c-0.005,0.007-0.012,0.012-0.016,0.02c-0.004,0.006-0.004,0.013-0.006,0.02
+  c-0.004,0.016-0.008,0.03-0.007,0.048c0.001,0.015,0.019,0.04-0.004,0.047c-0.008,0.002-0.016-0.001-0.024,0.003
+  c-0.007,0.004-0.012,0.008-0.02,0.01c-0.008,0.001-0.007-0.001-0.012,0.003c-0.001,0.001-0.003,0.006-0.005,0.008
+  c-0.003,0.004-0.008,0.007-0.012,0.012c-0.008,0.008-0.016,0.019-0.026,0.024c-0.01,0.006-0.019,0.002-0.029,0.004
+  c-0.007,0.002-0.01,0.005-0.02,0.004c-0.017-0.001-0.025-0.013-0.031-0.027c-0.008-0.018-0.012-0.033-0.025-0.047
+  c-0.004-0.004-0.009-0.009-0.01-0.014c-0.002-0.008-0.001-0.013-0.005-0.019c-0.008-0.013-0.02-0.019-0.032-0.027
+  c-0.013-0.009-0.025-0.019-0.04-0.024c-0.01-0.004-0.019-0.007-0.028-0.012s-0.015-0.004-0.024-0.006
+  c-0.015-0.004-0.036-0.006-0.052-0.003c-0.025,0.003-0.051,0.012-0.075,0.019c-0.012,0.003-0.037,0-0.037-0.015
+  c-0.01-0.001-0.016-0.004-0.028-0.004c-0.01,0-0.017-0.004-0.027-0.004c-0.011,0-0.018-0.004-0.028-0.004c-0.002,0-0.004,0-0.006,0
+  c-0.039,0.012-0.077,0.025-0.116,0.037c-0.003,0.006-0.005,0.014-0.009,0.02c-0.004,0.007-0.011,0.016-0.018,0.022
+  c-0.009,0.007-0.021,0.006-0.031,0.009c-0.008,0.003-0.006,0.005-0.008,0.012c-0.004,0.01-0.013,0.02-0.019,0.028
+  c-0.007,0.009-0.012,0.018-0.018,0.028c-0.002,0.003-0.004,0.007-0.006,0.011l0,0c0.004,0.006,0.007,0.014,0.006,0.02
+  c0,0.007-0.003,0.016-0.006,0.021c-0.004,0.008-0.01,0.012-0.016,0.019c-0.005,0.007-0.006,0.011-0.013,0.016
+  c-0.004,0.003-0.008,0.008-0.012,0.011c-0.005,0.003-0.012,0.004-0.015,0.01c-0.003,0.007,0.002,0.016-0.001,0.023
+  c-0.002,0.005-0.009,0.007-0.011,0.012c-0.002,0.005,0.001,0.011,0,0.016c-0.002,0.007-0.005,0.014-0.008,0.02
+  c-0.004,0.007-0.005,0.011-0.004,0.02c0,0.017,0.003,0.036-0.005,0.052c-0.006,0.014-0.01,0.029-0.015,0.044
+  c-0.006,0.015-0.013,0.028-0.017,0.043c-0.001,0.003-0.003,0.004-0.003,0.008c-0.001,0.004,0,0.009,0,0.013
+  c-0.001,0.003-0.003,0.006-0.004,0.008c0,0.004,0,0.008,0,0.011c-0.002,0.009-0.004,0.015-0.004,0.024v0.028
+  c0,0.02-0.003,0.036-0.009,0.055c-0.006,0.017-0.008,0.035-0.011,0.053c-0.002,0.008-0.006,0.015-0.004,0.024
+  c0.001,0.009,0.005,0.013,0.003,0.023c-0.001,0.002-0.003,0.006-0.003,0.009c-0.001,0.003,0,0.014-0.005,0.015
+  c-0.004,0.002-0.007-0.003-0.009-0.006c-0.002-0.006,0.001-0.006,0.002-0.013l-0.008,0.008c0.001-0.006-0.002-0.005-0.003-0.009
+  c-0.001-0.004-0.001-0.007-0.001-0.011c-0.001-0.007-0.004-0.015-0.007-0.021c-0.005-0.01-0.009-0.012-0.009-0.023
+  s-0.003-0.012-0.009-0.02c-0.005-0.007-0.008-0.011-0.006-0.019c0-0.003,0.008-0.02,0.002-0.024c-0.008-0.005-0.01,0.01-0.018,0.007
+  c-0.008-0.004-0.005-0.017-0.005-0.024c0-0.008,0-0.016,0-0.024c0-0.009,0.004-0.014,0.004-0.024c0-0.009,0.001-0.011,0.005-0.019
+  c0.004-0.007,0.003-0.015,0.003-0.025c0-0.008-0.005-0.012-0.004-0.019c0-0.009,0.007-0.016,0.008-0.024
+  c0.001-0.009-0.002-0.02,0-0.029c0.001-0.003,0.004-0.004,0.004-0.007c0.001-0.005-0.002-0.007-0.003-0.011
+  c0.003-0.002,0.005-0.011,0.006-0.014c0.001-0.006,0.002-0.013,0-0.019c-0.013,0.006-0.031,0.009-0.04,0.023
+  c-0.006,0.007-0.009,0.015-0.011,0.025c-0.002,0.011-0.01,0.02-0.012,0.032c-0.002,0.009-0.001,0.017-0.005,0.027
+  c-0.004,0.009-0.013,0.013-0.019,0.02c-0.005,0.006-0.003,0.01-0.005,0.017c-0.001,0.004-0.005,0.007-0.008,0.01
+  c-0.006,0.007-0.011,0.012-0.014,0.02c0.009,0.005-0.003,0.022-0.009,0.026c-0.005,0.004-0.009,0.005-0.012,0.011
+  c-0.002,0.005-0.002,0.011-0.005,0.016c-0.007,0.012-0.014,0.024-0.019,0.037c-0.005,0.014-0.007,0.029-0.013,0.043
+  c-0.003,0.008,0.002,0.008,0.002,0.016c0,0.011-0.011,0.008-0.016,0.013c-0.008,0.007-0.007,0.017-0.016,0.023
+  c-0.01,0.005-0.026,0.003-0.032-0.008c-0.003-0.005,0-0.015-0.001-0.02c0-0.009-0.002-0.015-0.005-0.023
+  c-0.002-0.006-0.002-0.011-0.003-0.017c-0.002-0.007-0.007-0.013-0.008-0.02c-0.001-0.008,0-0.012-0.004-0.02
+  c-0.003-0.004-0.01-0.012-0.011-0.017c-0.001-0.012,0.008-0.022,0.008-0.035c-0.001-0.014-0.008-0.024-0.011-0.037
+  c-0.003-0.01-0.002-0.025,0.006-0.032c0.008-0.006,0.026-0.005,0.028-0.018c0.001-0.007-0.006-0.015-0.009-0.02
+  c-0.003-0.008-0.001-0.013-0.002-0.021c-0.001-0.007-0.007-0.007,0.001-0.015c0.004-0.005,0.007-0.004,0.014-0.005
+  c0.002-0.008,0.001-0.012-0.005-0.018c-0.001-0.001-0.006-0.005-0.006-0.006c0-0.004,0.004-0.003,0.005-0.006
+  c0.001-0.005,0.002-0.006,0.003-0.012c0-0.004-0.002-0.01-0.001-0.013c0.002-0.007,0.009-0.013,0.013-0.019
+  c-0.005,0.004-0.011,0.013-0.014,0.019c-0.006,0.01-0.011,0.019-0.014,0.031c-0.001,0.01,0.005,0.03-0.008,0.033
+  c-0.009,0.002-0.019-0.002-0.028,0c0.007,0.007-0.007,0.017-0.012,0.024c-0.005,0.008-0.009,0.017-0.015,0.025
+  c-0.008,0.011-0.023,0.021-0.03,0.033c-0.004,0.007-0.006,0.026-0.018,0.026c0,0.014-0.035,0.019-0.044,0.027
+  c-0.008,0.007-0.011,0.016-0.021,0.02c-0.005,0.003-0.019,0.006-0.016,0.014c-0.009,0.007-0.013,0.022-0.019,0.032
+  c-0.01,0.018-0.017,0.041-0.03,0.057c-0.002,0.004-0.005,0.005-0.007,0.009c-0.002,0.003-0.003,0.007-0.005,0.011
+  c-0.008,0.013-0.02,0.016-0.034,0.021c-0.012,0.005-0.026,0.002-0.038,0.007c-0.009,0.004-0.012,0.01-0.018,0.017
+  c-0.004,0.004-0.005,0.005-0.013,0.004c-0.005-0.001-0.008-0.001-0.008-0.007c-0.198,0.776-0.304,1.59-0.304,2.428
+  c0,5.385,4.365,9.75,9.75,9.75s9.75-4.365,9.75-9.75C-15.25,49.098-15.794,47.324-16.736,45.824z M-17.781,55.174
+  c0.006,0.002,0.007,0.007,0.004,0.011c-0.003,0.005-0.005,0.009-0.007,0.014c-0.008,0.015-0.022,0.028-0.018,0.048
+  c0.002,0.015,0.013-0.002,0.018-0.007c0.008-0.008,0.014-0.017,0.023-0.024c0.008-0.006,0.018-0.008,0.027-0.015
+  c0.007-0.005,0.014-0.01,0.02-0.016c0.007-0.005,0.012-0.011,0.019-0.016c0.007-0.005,0.014-0.01,0.021-0.016
+  c0.005-0.005,0.009-0.01,0.013-0.016c0.004-0.004,0.008-0.006,0.012-0.011c0.007-0.009,0.014-0.018,0.026-0.02
+  c0.008-0.002,0.016-0.002,0.023-0.003c0.016-0.003,0.031-0.01,0.044-0.02c0.004-0.003,0.008-0.008,0.013-0.011
+  c0.006-0.003,0.011-0.005,0.016-0.009c0.006-0.004,0.013-0.009,0.02-0.011c0.004-0.001,0.01-0.002,0.014-0.004
+  c0.005-0.002,0.008-0.008,0.011-0.013c0.009-0.014,0.027-0.02,0.041-0.029c0.009-0.006,0.017-0.015,0.023-0.024
+  c0.006-0.008,0.011-0.017,0.019-0.023c0.017-0.015,0.034-0.03,0.054-0.042c0.007-0.004,0.015-0.011,0.02-0.019
+  c0.004-0.008,0.006-0.017,0.009-0.025c0.007-0.016,0.017-0.033,0.029-0.045c0.016-0.016,0.036-0.027,0.054-0.04
+  c0.005-0.005,0.011-0.008,0.017-0.012c0.005-0.004,0.008-0.009,0.012-0.013c0.01-0.01,0.013-0.024,0.02-0.036
+  c0.006-0.01,0.012-0.02,0.02-0.029c0.005-0.005,0.01-0.012,0.014-0.018c-0.017,0.004-0.027,0.013-0.036,0.026
+  c-0.002,0.002-0.005,0.005-0.007,0.007c-0.003,0.003-0.004,0.007-0.007,0.011c-0.006,0.008-0.015,0.013-0.022,0.02
+  c-0.009,0.009-0.016,0.019-0.024,0.028s-0.016,0.019-0.024,0.029c-0.004,0.004-0.007,0.009-0.012,0.013
+  c-0.004,0.004-0.009,0.007-0.013,0.011c-0.007,0.009-0.017,0.018-0.027,0.023c-0.003,0.002-0.011,0.005-0.015,0.003
+  c-0.003-0.003,0-0.006,0.001-0.009c0.004-0.01,0.008-0.018,0.015-0.025c0.007-0.006,0.013-0.015,0.019-0.022
+  c0.005-0.007,0.012-0.012,0.018-0.018c0.013-0.016,0.031-0.028,0.045-0.044c0.007-0.007,0.013-0.016,0.02-0.024
+  c0.006-0.008,0.013-0.016,0.019-0.024c0.005-0.006,0.009-0.013,0.014-0.02l-0.003,0.007c0.005-0.002,0.012-0.013,0.009-0.018
+  c-0.003,0.001-0.005,0.002-0.009,0.002c-0.004,0-0.005,0.001-0.009,0.004c-0.015,0.011-0.028,0.028-0.045,0.039
+  c-0.009,0.006-0.019,0.012-0.027,0.019c-0.007,0.005-0.012,0.012-0.019,0.018c-0.013,0.01-0.024,0.021-0.036,0.033
+  c-0.005,0.005-0.01,0.01-0.016,0.014c-0.005,0.003-0.008,0.002-0.014,0.002c-0.008,0.001-0.018,0.012-0.023,0.018
+  c-0.01,0.013-0.024,0.023-0.036,0.034c-0.002,0.003-0.007,0.006-0.008,0.01c-0.001,0.004-0.001,0.002,0.002,0.004
+  c0.003,0.004,0.005,0.003,0.004,0.01c0,0.003-0.003,0.013-0.007,0.013c-0.003,0.001-0.004-0.003-0.006-0.005
+  c-0.002-0.001-0.005-0.001-0.007-0.002c-0.002-0.002-0.002-0.004-0.005-0.004s-0.006,0.005-0.007,0.007
+  c-0.004,0.004-0.01,0.006-0.016,0.009c-0.004,0.003-0.013,0.004-0.013,0.011c0,0.005,0.006,0.006,0.005,0.011
+  c-0.001,0.005-0.006,0.005-0.009,0.007c-0.006,0.004-0.011,0.01-0.016,0.014c-0.016,0.015-0.028,0.032-0.043,0.047
+  c-0.006,0.007-0.013,0.012-0.019,0.019c-0.004,0.005-0.008,0.011-0.014,0.015c-0.008,0.007-0.016,0.014-0.027,0.017
+  c-0.007,0.003-0.014,0.005-0.021,0.008c-0.007,0.004-0.011,0.008-0.017,0.013c-0.007,0.007-0.016,0.012-0.023,0.017
+  c-0.016,0.013-0.032,0.027-0.049,0.038c-0.005,0.004-0.008,0.004-0.013,0.007c-0.011,0.005-0.02,0.014-0.03,0.021
+  c-0.015,0.011-0.032,0.02-0.045,0.033c-0.004,0.004-0.013,0.015-0.011,0.021c0.001,0.004,0.006,0.006,0.009,0.005
+  c0.004-0.001,0.009-0.007,0.012-0.01c0.001-0.001,0.006-0.006,0.008-0.003C-17.778,55.171-17.779,55.173-17.781,55.174z
+  M-17.109,54.626c0,0.004-0.001,0.011,0.003,0.014c0.002,0.001,0.01,0,0.013-0.001c0.009-0.002,0.019-0.008,0.025-0.015
+  c0.004-0.005,0.005-0.013,0.009-0.019c0.005-0.007,0.009-0.015,0.013-0.022c0.007-0.011,0.013-0.022,0.02-0.033
+  c0.01-0.015,0.022-0.029,0.03-0.044c0.018-0.032,0.031-0.067,0.051-0.097c0.019-0.029,0.04-0.056,0.059-0.085
+  c0.009-0.015,0.022-0.029,0.03-0.045c0.004-0.01,0.02-0.035,0.011-0.046c-0.01-0.013-0.031,0.024-0.034,0.029
+  c-0.014,0.017-0.026,0.034-0.039,0.051c-0.005,0.005-0.007,0.012-0.012,0.018c-0.002,0.004-0.003,0.007-0.005,0.011
+  c-0.001,0.003-0.004,0.005-0.005,0.008c-0.002,0.003-0.003,0.005-0.005,0.008c-0.003,0.003-0.005,0.006-0.007,0.009
+  c-0.005,0.007-0.01,0.014-0.014,0.021c-0.006,0.01-0.013,0.019-0.018,0.029c-0.005,0.008-0.011,0.015-0.016,0.023
+  c-0.006,0.01-0.015,0.019-0.021,0.029c-0.004,0.01-0.009,0.018-0.011,0.028c-0.008,0.028-0.03,0.05-0.046,0.073
+  c-0.007,0.011-0.017,0.02-0.024,0.031h-0.001c0.001-0.001,0.001-0.003,0.001-0.004l-0.005,0.011
+  c-0.001,0.001-0.001,0.002-0.002,0.002c0,0.001,0,0.002,0,0.003l0.002-0.005c0.001-0.002,0.003-0.004,0.004-0.007
+  C-17.104,54.61-17.108,54.618-17.109,54.626z M-17.08,54.48c0.01-0.013,0.024-0.024,0.032-0.038c0.01-0.017,0.017-0.035,0.025-0.052
+  c0.005-0.01,0.009-0.019,0.012-0.029c0.003-0.009,0.005-0.018,0.009-0.026c0.007-0.014,0.014-0.031,0.026-0.043
+  c0.004-0.004,0.007-0.006,0.01-0.01c0.003-0.005,0.005-0.011,0.009-0.016c0.004-0.006,0.01-0.012,0.014-0.017
+  c0.006-0.008,0.013-0.015,0.018-0.022c0.007-0.009,0.014-0.018,0.021-0.026c0.004-0.007,0.012-0.02,0.011-0.028
+  c-0.002,0.002-0.003,0.003-0.006,0.005c-0.006,0.004-0.016,0.004-0.022,0.009c-0.003,0.003-0.005,0.006-0.008,0.008
+  c-0.007,0.004-0.013,0.011-0.019,0.016c-0.007,0.007-0.012,0.015-0.019,0.021c-0.003,0.003-0.007,0.007-0.01,0.01
+  c-0.008,0.009-0.014,0.019-0.021,0.028c-0.009,0.012-0.02,0.022-0.029,0.034c-0.008,0.008-0.015,0.015-0.023,0.023
+  c-0.007,0.007-0.013,0.016-0.021,0.022c-0.008,0.006-0.015,0.014-0.022,0.021c-0.006,0.007-0.011,0.013-0.018,0.019
+  c-0.006,0.006-0.013,0.012-0.019,0.019c-0.004,0.005-0.009,0.008-0.013,0.014c-0.005,0.006-0.01,0.012-0.016,0.017
+  c-0.007,0.006-0.014,0.011-0.021,0.017c-0.005,0.004-0.008,0.009-0.014,0.012c-0.008,0.004-0.022,0.008-0.026,0.017
+  c-0.003,0.009-0.005,0.017-0.01,0.025c-0.006,0.011-0.011,0.021-0.019,0.031c-0.008,0.01-0.018,0.02-0.026,0.03
+  c-0.009,0.011-0.018,0.022-0.026,0.034c-0.003,0.005-0.005,0.01-0.008,0.014c-0.002,0.003-0.005,0.005-0.006,0.007
+  c-0.002,0.003-0.002,0.007-0.005,0.01c-0.002,0.001-0.005,0.002-0.007,0.004c-0.001,0.001-0.002,0.004-0.004,0.005
+  c-0.005,0.004-0.009,0.008-0.013,0.013c-0.003,0.004-0.007,0.007-0.011,0.011c-0.002,0.004-0.004,0.008-0.008,0.011
+  c-0.005,0.004-0.012,0.004-0.017,0.007c-0.013,0.01-0.02,0.026-0.034,0.035c-0.011,0.008-0.013,0.02-0.023,0.03
+  c-0.006,0.006-0.012,0.01-0.018,0.016c-0.003,0.003-0.012,0.01-0.013,0.015c-0.001,0.005,0.003,0.007,0.003,0.011h-0.001h0.001
+  c0.001,0.001,0.003,0,0.004-0.002c0.002-0.001,0.005-0.003,0.007-0.005c0.005-0.004,0.008-0.005,0.013-0.006
+  c0.003-0.001,0.007-0.003,0.009-0.005c0.005-0.004,0.009-0.007,0.014-0.009c0.022-0.012,0.04-0.031,0.057-0.048
+  c0.014-0.014,0.03-0.026,0.045-0.038c0.021-0.015,0.041-0.033,0.064-0.046c0.023-0.014,0.042-0.035,0.063-0.051
+  c0.02-0.017,0.04-0.034,0.059-0.052C-17.113,54.515-17.094,54.499-17.08,54.48z M-20.326,56.962c0.008,0.008,0.02,0.009,0.031,0.011
+  c0.004,0.001,0.008,0.001,0.011,0.002c0.001-0.007,0.004-0.009,0.006-0.016c0.006-0.022-0.02-0.036-0.037-0.032
+  c-0.004,0.001-0.013,0.003-0.018,0.007c0.001,0.005-0.001,0.012,0.001,0.018c0,0,0.001,0,0.001,0.001h0.031
+  C-20.309,56.958-20.317,56.961-20.326,56.962z M-16.279,52.758c-0.003,0.011-0.009,0.027-0.014,0.037
+  c-0.01,0.02-0.024,0.034-0.038,0.05c-0.01,0.011-0.027,0.034-0.042,0.028c0.006-0.009,0.007-0.018,0.007-0.029
+  c0.001-0.019,0.003-0.036,0.006-0.056c0.002-0.009-0.001-0.018,0-0.027c0-0.009,0.002-0.013,0.004-0.02
+  c0.002-0.008,0-0.015,0.001-0.022c0.001-0.009,0.004-0.014,0.006-0.022c0.005-0.022,0.006-0.045,0.017-0.065
+  c0.004-0.008,0.012-0.024,0.021-0.027c0.015-0.006,0.025,0.015,0.027,0.027c0.006,0.026,0.002,0.055,0.01,0.081
+  c0.003,0.011-0.003,0.017-0.005,0.028C-16.28,52.746-16.278,52.752-16.279,52.758z M-16.376,52.871
+  c0.001,0.001,0.002,0.002,0.003,0.002c-0.001,0.001-0.002,0.002-0.003,0.004V52.871z M-16.881,54.798
+  c-0.002,0.003-0.004,0.007-0.006,0.011c-0.003,0.005-0.008,0.007-0.01,0.011c-0.014,0.019-0.025,0.036-0.041,0.052
+  c-0.009,0.009-0.024,0.02-0.026,0.034v-0.021c0.012-0.01,0.016-0.025,0.021-0.038c0.003-0.007,0.007-0.01,0.01-0.016
+  c0.007-0.012,0.007-0.022,0.017-0.032c0.012-0.013,0.017-0.026,0.025-0.043c0.006-0.014,0.018-0.025,0.024-0.039
+  c0.003-0.007,0-0.01,0.006-0.015c0.011,0.016,0.008,0.045-0.001,0.062C-16.868,54.775-16.875,54.786-16.881,54.798z M-16.936,54.754
+  c-0.019,0.042-0.028,0.087-0.055,0.125c-0.011,0.015-0.021,0.027-0.029,0.044c-0.004,0.009-0.008,0.017-0.011,0.026
+  c-0.003,0.009-0.005,0.019-0.008,0.028c-0.007,0.022-0.015,0.04-0.029,0.059c-0.006,0.009-0.024,0.044-0.037,0.044
+  c0-0.001,0-0.001,0-0.002l-0.012,0.008c0.003-0.021,0.022-0.043,0.032-0.061c0.007-0.013,0.012-0.03,0.017-0.044
+  c0.009-0.02,0.02-0.037,0.029-0.057c0.013-0.027,0.033-0.048,0.042-0.077c0.004-0.011,0.005-0.022,0.01-0.033
+  c0.004-0.011,0.012-0.021,0.016-0.033c0.004-0.01,0.005-0.021,0.008-0.031c0.004-0.012,0.011-0.022,0.015-0.034
+  c0.006-0.017,0.008-0.036,0.015-0.055c0.007-0.017,0.015-0.031,0.025-0.047c0.006-0.011,0.027-0.04,0.031-0.012
+  c0.004,0.026-0.017,0.048-0.026,0.071C-16.914,54.7-16.923,54.727-16.936,54.754z M-17.041,54.825
+  c-0.007,0.028-0.023,0.052-0.033,0.079c-0.007,0.017-0.012,0.036-0.021,0.053c-0.009,0.019-0.023,0.036-0.032,0.056
+  c-0.01,0.018-0.017,0.038-0.028,0.055c-0.009,0.016-0.018,0.03-0.025,0.047c-0.013,0.028-0.033,0.053-0.046,0.08
+  c-0.007,0.018-0.015,0.036-0.022,0.055c-0.008,0.019-0.028,0.035-0.036,0.055c-0.004,0.01-0.006,0.017-0.013,0.025
+  c-0.005,0.004-0.019,0.022-0.021,0.007V55.32c0.001-0.053,0.038-0.097,0.064-0.141c0.006-0.01,0.009-0.019,0.013-0.028
+  c0.005-0.008,0.011-0.013,0.017-0.021c0.006-0.009,0.011-0.018,0.015-0.028c0.005-0.014,0.006-0.027,0.013-0.04
+  c0.005-0.01,0.015-0.017,0.02-0.026c0.004-0.008,0.004-0.013,0.006-0.021c0.004-0.01,0.011-0.023,0.016-0.032
+  c0.007-0.012,0.016-0.021,0.023-0.033c0.008-0.015,0.015-0.03,0.026-0.043c0.015-0.021,0.022-0.041,0.028-0.066
+  c0.002-0.009,0.007-0.018,0.011-0.027c0.004-0.011,0.003-0.026,0.013-0.034c0.009-0.007,0.023-0.007,0.023,0.007
+  c0,0.001-0.004,0.014-0.005,0.016C-17.037,54.81-17.039,54.818-17.041,54.825z M-17.292,55.364c0.006-0.01,0.009-0.02,0.016-0.029
+  c0.007-0.009,0.015-0.016,0.022-0.026c0.01-0.015,0.027-0.024,0.038-0.039c0.007-0.009,0.012-0.022,0.019-0.032
+  c0.005-0.006,0.011-0.01,0.015-0.016c0.005-0.005,0.012-0.012,0.015-0.017c0.01-0.014,0.015-0.03,0.023-0.044
+  c0.012-0.022,0.032-0.037,0.044-0.059c0.014-0.026,0.025-0.05,0.041-0.075c0.008-0.012,0.018-0.021,0.026-0.033
+  c0.007-0.013,0.013-0.036,0.024-0.045c0.012-0.009,0.013-0.001,0.012,0.012c0,0.016-0.007,0.029-0.015,0.043
+  c-0.014,0.027-0.03,0.055-0.043,0.082c-0.007,0.013-0.011,0.026-0.018,0.038c-0.004,0.007-0.008,0.016-0.012,0.023
+  c-0.005,0.006-0.01,0.007-0.014,0.015c-0.013,0.025-0.025,0.045-0.045,0.066c-0.012,0.013-0.019,0.027-0.028,0.042
+  c-0.009,0.015-0.022,0.026-0.032,0.039c-0.015,0.02-0.027,0.041-0.043,0.06c-0.014,0.016-0.026,0.031-0.038,0.049
+  c-0.011,0.016-0.024,0.029-0.032,0.045c-0.008,0.018-0.017,0.036-0.029,0.052c-0.01,0.012-0.021,0.022-0.03,0.035
+  c-0.014,0.017-0.03,0.034-0.041,0.053c-0.008,0.012-0.013,0.025-0.019,0.038c-0.006,0.012-0.014,0.02-0.02,0.032
+  c-0.003,0.007-0.007,0.014-0.01,0.021c-0.004,0.007-0.006,0.017-0.01,0.025v-0.001l-0.011-0.011
+  c0.002-0.001,0.003-0.001,0.005-0.002c0-0.007,0.005-0.018,0.007-0.024c0.005-0.015,0.021-0.028,0.028-0.042
+  c0.011-0.022,0.019-0.044,0.033-0.063c0.004-0.007,0.009-0.015,0.014-0.021c0.006-0.006,0.013-0.01,0.018-0.017
+  c0.013-0.018,0.018-0.042,0.03-0.06c0.013-0.02,0.028-0.036,0.035-0.059C-17.31,55.4-17.303,55.382-17.292,55.364z M-17.472,55.592
+  c-0.009,0.016-0.017,0.031-0.024,0.048c-0.006,0.014-0.015,0.021-0.022,0.034c-0.009,0.016-0.013,0.034-0.019,0.052
+  c-0.006,0.018-0.018,0.034-0.027,0.051c-0.006,0.012-0.015,0.022-0.022,0.033c-0.005,0.007-0.008,0.015-0.014,0.022
+  c-0.004,0.006-0.009,0.01-0.013,0.016c-0.019,0.025-0.037,0.041-0.064,0.055c-0.014,0.006-0.028,0.01-0.043,0.014
+  c-0.024,0.006-0.039,0.02-0.059,0.031c-0.013,0.006-0.026,0.012-0.039,0.018c-0.013,0.006-0.026,0.011-0.039,0.014
+  c-0.009,0.003-0.018,0.008-0.027,0.01c-0.007,0.001-0.015-0.002-0.022-0.001s-0.015,0.005-0.022,0.007
+  C-17.942,56.001-17.955,56-17.971,56l-0.011-0.016c-0.006,0.008-0.024,0.007-0.032,0.006c-0.008-0.002-0.013-0.005-0.021-0.006
+  s-0.014,0.001-0.022-0.001c-0.01-0.002-0.024-0.006-0.03-0.015c-0.004-0.006-0.009-0.026-0.008-0.033
+  c0.001-0.016,0.021-0.039,0.033-0.049c0.008-0.007,0.021-0.009,0.031-0.015c0.011-0.006,0.02-0.013,0.029-0.022
+  c0.006-0.006,0.012-0.011,0.02-0.016c0.004-0.002,0.012-0.008,0.017-0.007c0.005,0,0.005,0.005,0.01,0.006
+  c0.011,0.003,0.024-0.004,0.033-0.01c0.009-0.006,0.016-0.009,0.026-0.013c0.016-0.007,0.036-0.021,0.056-0.016
+  c0.01,0.003,0.015,0.006,0.027,0.006c0.014,0,0.024,0.006,0.038,0.005c0.012,0,0.02,0.004,0.031,0.007
+  c0.007,0.002,0.003,0.004,0.012,0.003c0.006,0,0.01-0.004,0.017-0.004c0.011-0.001,0.019,0.001,0.028-0.004
+  c0.01-0.005,0.018-0.011,0.028-0.017c0.016-0.009,0.032-0.022,0.047-0.035c0.016-0.013,0.026-0.034,0.042-0.049
+  c0.016-0.014,0.025-0.028,0.039-0.044c0.012-0.014,0.019-0.03,0.029-0.047c0.011-0.017,0.013-0.04,0.025-0.056
+  c0.006-0.009,0.036-0.043,0.044-0.042c0.006,0.013-0.008,0.028-0.014,0.038C-17.455,55.567-17.465,55.579-17.472,55.592z
+  M-18.013,56.088c0.011-0.001,0.025,0.002,0.037,0c0.015-0.003,0.03-0.015,0.043-0.022c0.007-0.004,0.011-0.009,0.018-0.002
+  c0.01,0.01,0.001,0.019-0.007,0.026c-0.014,0.012-0.029,0.023-0.043,0.031c-0.008,0.005-0.042,0.033-0.044,0.015l0.002-0.005
+  c-0.016,0.001-0.034-0.006-0.051-0.005c-0.013,0-0.047-0.01-0.044-0.028c0.004-0.018,0.04-0.025,0.054-0.02
+  C-18.034,56.082-18.029,56.088-18.013,56.088z M-18.048,56.206c0.02-0.008,0.045-0.013,0.066-0.01
+  c0.013,0.002,0.012,0.002,0.007,0.012c-0.005,0.01-0.01,0.018-0.018,0.025c-0.015,0.013-0.033,0.012-0.049,0.022
+  c-0.006,0.003-0.009,0.01-0.015,0.014c-0.007,0.004-0.013,0.003-0.022,0.005c-0.001,0.002-0.003,0.004-0.006,0.004
+  c-0.006,0.002-0.011,0-0.017,0.001c-0.003,0.001-0.01,0.002-0.015,0.003l0.004-0.004c-0.015,0.002-0.05-0.02-0.049-0.038
+  c0-0.011,0.014-0.02,0.023-0.024c0.008-0.002,0.016-0.003,0.025-0.004c0.01,0,0.007,0.004,0.014,0.005
+  C-18.08,56.221-18.066,56.213-18.048,56.206z M-18.259,56.168c-0.008,0.003-0.015,0.01-0.022,0.012
+  c-0.009,0.003-0.026,0.002-0.033,0.011l0.006-0.011c-0.005-0.023,0.023-0.051,0.038-0.066c0.006-0.005,0.015-0.011,0.021-0.016
+  c0.011-0.007,0.013-0.016,0.022-0.025c0.007-0.006,0.014-0.007,0.021-0.013c0.006-0.004,0.011-0.012,0.016-0.018
+  c0.006-0.006,0.024-0.03,0.034-0.026c0.023,0.009-0.045,0.111-0.059,0.126C-18.228,56.156-18.242,56.16-18.259,56.168z
+  M-18.196,55.957c-0.007,0.017-0.013,0.039-0.024,0.055c-0.011,0.015-0.027,0.018-0.041,0.03c-0.009,0.009-0.018,0.016-0.027,0.025
+  c-0.011,0.011-0.017,0.025-0.031,0.015l0.005-0.011c-0.001,0-0.003,0-0.005-0.001c0.001-0.01,0.009-0.018,0.015-0.026
+  c0.012-0.018,0.024-0.036,0.038-0.053c0.004-0.004,0.008-0.009,0.013-0.013c0.003-0.004,0.003-0.01,0.006-0.015
+  c0.005-0.007,0.014-0.01,0.019-0.017c0.014-0.018,0.014-0.036,0.035-0.049c0.005-0.003,0.024-0.02,0.031-0.016
+  c0.008,0.007-0.007,0.022-0.009,0.027C-18.178,55.925-18.188,55.94-18.196,55.957z M-18.255,56.79c0.002,0.007,0.003,0.018,0,0.025
+  c-0.003,0.008-0.013,0.011-0.009,0.022c0.02-0.006,0.027-0.032,0.039-0.046c0.005-0.008,0.014-0.012,0.02-0.019
+  c0.012-0.013,0.016-0.033,0.026-0.048c0.011-0.019,0.029-0.036,0.049-0.045c0.008-0.003,0.02-0.005,0.027-0.011
+  c0.004-0.002,0.007-0.01,0.012-0.01c0.008,0.001,0.007,0.012,0.006,0.018c-0.003,0.01-0.008,0.021-0.011,0.032
+  c-0.004,0.009-0.01,0.022-0.011,0.033c-0.004,0.024-0.011,0.044-0.028,0.063c-0.01,0.011-0.021,0.023-0.028,0.036
+  c-0.008,0.014-0.012,0.025-0.027,0.035c-0.012,0.008-0.049,0.035-0.063,0.028c0.001-0.012,0.027-0.021,0.036-0.028
+  c0.005-0.004,0.01-0.01,0.013-0.015c0.004-0.004,0.014-0.015,0.015-0.02c-0.012-0.006-0.026,0.005-0.036,0.011
+  c-0.013,0.007-0.025,0.014-0.036,0.024c-0.01,0.01-0.022,0.019-0.032,0.029c-0.005,0.004-0.01,0.007-0.014,0.012
+  c-0.006,0.007-0.006,0.018-0.012,0.025c-0.009,0.011-0.02,0.018-0.022,0.034c-0.001,0.006,0.002,0.014-0.001,0.02
+  c-0.003,0.005-0.011,0.009-0.015,0.012c-0.014,0.01-0.025,0.018-0.035,0.032c-0.007,0.01-0.014,0.022-0.025,0.03
+  c-0.018,0.012-0.046,0.026-0.053,0.048c-0.003,0.007-0.002,0.011-0.006,0.017c-0.003,0.005-0.009,0.01-0.012,0.015
+  c-0.008,0.011-0.014,0.024-0.021,0.034c-0.017,0.021-0.044,0.036-0.066,0.051c-0.009,0.006-0.016,0.015-0.023,0.022
+  c-0.005,0.004-0.011,0.007-0.016,0.011c0.007-0.009,0.008-0.021,0.012-0.031c0.004-0.011,0.006-0.022,0.011-0.033
+  c0.007-0.016,0.013-0.034,0.022-0.049c0.005-0.009,0.003-0.012,0.005-0.022c0.001-0.006,0.006-0.012,0.009-0.018
+  c0.005-0.009,0.01-0.017,0.017-0.026c0.009-0.015,0.023-0.024,0.034-0.037c0.007-0.01,0.015-0.021,0.023-0.032
+  c0.008-0.011,0.02-0.015,0.031-0.023c0.013-0.009,0.022-0.021,0.031-0.034c0.003-0.004,0.005-0.005,0.007-0.009
+  c0.003-0.006,0.003-0.016,0.007-0.021c0.006-0.007,0.015-0.009,0.022-0.016c0.008-0.009,0.01-0.017,0.016-0.027
+  c0.007-0.012,0.02-0.018,0.027-0.029c0.01-0.012,0.017-0.018,0.03-0.028C-18.291,56.817-18.276,56.799-18.255,56.79z
+  M-18.624,57.274c0.001,0,0.002-0.001,0.003-0.002c-0.001,0.002-0.003,0.004-0.003,0.007V57.274z M-18.13,56.418
+  c-0.021,0.014-0.052,0.017-0.071,0.035l-0.009,0.01c-0.009-0.012-0.014-0.014-0.005-0.027c0.012-0.016,0.028-0.03,0.043-0.044
+  c0.021-0.021,0.044-0.035,0.07-0.049c0.011-0.007,0.019-0.016,0.03-0.022c0.012-0.006,0.025-0.008,0.036-0.016
+  c0.01-0.008,0.022-0.019,0.031-0.028c0.006-0.007,0.033-0.055,0.04-0.037c0.004,0.01-0.011,0.029-0.016,0.038
+  c-0.008,0.017-0.015,0.03-0.028,0.044c-0.018,0.017-0.037,0.034-0.056,0.048c-0.01,0.008-0.019,0.018-0.03,0.024
+  C-18.107,56.401-18.118,56.41-18.13,56.418z M-17.835,56.051c0.012-0.008,0.022-0.019,0.032-0.027
+  c0.013-0.01,0.026-0.019,0.039-0.028c0.009-0.006,0.017-0.012,0.025-0.019c0.013-0.009,0.026-0.019,0.036-0.031
+  c0.011-0.012,0.021-0.031,0.037-0.037c0.022-0.01,0.017,0.015,0.009,0.026c-0.01,0.016-0.02,0.034-0.033,0.048
+  c-0.011,0.013-0.022,0.022-0.035,0.032c-0.013,0.011-0.022,0.022-0.034,0.034c-0.012,0.013-0.027,0.02-0.039,0.032
+  c-0.009,0.008-0.017,0.017-0.026,0.024c-0.01,0.009-0.021,0.015-0.029,0.026c-0.008,0.012-0.016,0.027-0.031,0.033l-0.005-0.006
+  c-0.012,0.003-0.032-0.006-0.034-0.018c-0.005-0.027,0.026-0.05,0.044-0.063C-17.864,56.066-17.85,56.06-17.835,56.051z
+  M-17.847,56.169c0.005-0.008,0.011-0.015,0.018-0.021c0.013-0.011,0.024-0.022,0.036-0.033c0.011-0.01,0.025-0.019,0.035-0.031
+  c0,0.017-0.013,0.035-0.023,0.048c-0.012,0.017-0.017,0.035-0.032,0.049c-0.006,0.005-0.01,0.011-0.015,0.017
+  c-0.007,0.008-0.01,0.006-0.018,0.009c-0.019,0.008-0.021,0.013-0.022,0.033l-0.011-0.011l-0.001,0.003
+  c-0.008-0.006,0.006-0.031,0.012-0.038C-17.861,56.185-17.853,56.179-17.847,56.169z M-17.809,56.229
+  c0.012-0.01,0.023-0.022,0.034-0.033c0.009-0.008,0.011-0.017,0.018-0.026c0.008-0.012,0.022-0.021,0.031-0.034
+  c0.003-0.004,0.01-0.017,0.016-0.016c0.012,0,0.004,0.02,0.002,0.026c-0.004,0.011-0.008,0.026-0.015,0.036
+  c-0.007,0.01-0.017,0.016-0.025,0.025c-0.013,0.017-0.026,0.032-0.042,0.045c-0.02,0.017-0.038,0.036-0.061,0.048l0.005-0.017
+  C-17.873,56.28-17.814,56.233-17.809,56.229z M-17.71,56.066l-0.005,0.011c-0.021-0.023-0.007-0.047,0.011-0.064
+  c0.015-0.016,0.032-0.03,0.048-0.045c0.018-0.016,0.036-0.032,0.052-0.049c0.011-0.011,0.02-0.022,0.03-0.033
+  c0.019-0.02,0.03-0.045,0.048-0.065c0.03-0.036,0.067-0.076,0.087-0.12c0.004-0.009,0.009-0.018,0.013-0.027
+  c0.008-0.016,0.017-0.033,0.026-0.048c0.004-0.006,0.038-0.051,0.048-0.044c0.014,0.009-0.017,0.057-0.022,0.064
+  c-0.009,0.016-0.022,0.029-0.031,0.044c-0.008,0.012-0.018,0.021-0.026,0.033s-0.015,0.023-0.024,0.035
+  c-0.012,0.015-0.024,0.029-0.033,0.047c-0.013,0.026-0.033,0.046-0.049,0.07c-0.029,0.044-0.072,0.079-0.098,0.124
+  c-0.007,0.014-0.019,0.031-0.031,0.04c-0.014,0.009-0.027,0.027-0.043,0.032L-17.71,56.066z M-19.005,57.415l-0.022,0.006
+  c0.005-0.004,0.007-0.013,0.01-0.018c0.003-0.007,0.007-0.014,0.012-0.02c0.007-0.009,0.026-0.027,0.038-0.028
+  c0.017-0.001,0.021,0.016,0.013,0.028c-0.005,0.006-0.014,0.012-0.02,0.017C-18.982,57.408-18.993,57.418-19.005,57.415z
+  M-19.109,57.361h-0.01l-0.005-0.001c0.006-0.014,0.039-0.065,0.06-0.053c0.002,0.002,0.009,0.015,0.009,0.017
+  c0.001,0.01-0.004,0.012-0.01,0.021C-19.076,57.36-19.093,57.381-19.109,57.361z M-19.194,57.357
+  c-0.007,0.003-0.029,0.011-0.023-0.007h-0.017c0.015-0.005,0.022-0.022,0.032-0.034c0.004-0.005,0.01-0.013,0.016-0.016
+  c0.007-0.004,0.015-0.003,0.022-0.008c0.001,0.009,0.012,0.012,0.013,0.02c0,0.007-0.017,0.024-0.021,0.029
+  C-19.179,57.348-19.185,57.353-19.194,57.357z M-19.499,57.514c-0.001,0.002-0.001,0.003-0.001,0.005l-0.006-0.006
+  c-0.001,0.001-0.002,0.001-0.003,0.001c0.019-0.023,0.036-0.05,0.063-0.065c0.014-0.007,0.025-0.011,0.039-0.022
+  c0.01-0.008,0.016-0.022,0.031-0.016c-0.002,0.025-0.035,0.052-0.053,0.065C-19.45,57.491-19.474,57.511-19.499,57.514z
+  M-19.589,57.621c-0.005,0.009-0.012,0.015-0.019,0.023c-0.011,0.012-0.013,0.008-0.027,0.012c-0.008,0.002-0.014,0.009-0.023,0.01
+  c-0.005,0-0.013-0.001-0.019-0.001c0.003-0.001,0.005-0.003,0.008-0.005l-0.016,0.006c-0.007-0.001-0.011-0.008-0.016-0.013
+  c0.002-0.008,0.009-0.011,0.016-0.016c0.011-0.008,0.021-0.018,0.032-0.027c0.008-0.005,0.011-0.013,0.018-0.019
+  s0.017-0.012,0.026-0.016c0.017-0.01,0.027-0.022,0.038-0.036c0.004-0.006,0.013-0.017,0.02-0.022
+  c0.011-0.007,0.016-0.005,0.018,0.007c0.003,0.022-0.012,0.035-0.026,0.051C-19.571,57.589-19.579,57.605-19.589,57.621z
+  M-19.772,57.757c-0.03,0.027-0.066,0.047-0.098,0.071c-0.016,0.011-0.027,0.023-0.038,0.039c-0.011,0.015-0.024,0.018-0.039,0.026
+  c-0.014,0.007-0.024,0.027-0.039,0.033c-0.006,0.002-0.013,0.001-0.019,0.002c-0.002,0.001-0.004,0.001-0.006,0.002
+  c-0.004-0.005,0.008-0.02,0.011-0.025c0.013-0.018,0.034-0.026,0.047-0.043c0.01-0.014,0.022-0.026,0.034-0.038
+  c0.01-0.012,0.017-0.023,0.025-0.035c0.009-0.012,0.027-0.022,0.039-0.031c0.018-0.013,0.03-0.031,0.049-0.045
+  c0.013-0.01,0.024-0.016,0.039-0.021c0.011-0.004,0.011-0.001,0.022,0.001c0.009,0.002,0.014-0.002,0.021-0.005
+  c0.004,0.008-0.012,0.03-0.017,0.037C-19.75,57.736-19.761,57.747-19.772,57.757z M-20.016,57.932c0.002,0,0.004-0.001,0.005-0.002
+  c0.001,0.001,0.002,0.002,0.005,0.002H-20.016z M-20.023,57.932h0.007c-0.004,0.003-0.008,0.005-0.01,0.007
+  C-20.024,57.937-20.023,57.935-20.023,57.932z M-19.994,57.988c-0.005,0.009-0.017,0.017-0.023,0.025
+  c-0.008,0.009-0.016,0.018-0.022,0.028c-0.007,0.011-0.016,0.017-0.027,0.024c-0.01,0.005-0.017,0.014-0.027,0.02
+  c-0.019,0.011-0.04,0.015-0.056,0.031c-0.006,0.006-0.015,0.018-0.022,0.022c-0.004,0.003-0.011,0.003-0.015,0
+  c-0.002,0-0.003-0.001-0.003-0.002c0.001-0.003,0.003-0.005,0.004-0.007c0.009-0.014,0.019-0.026,0.032-0.036
+  c0.011-0.009,0.023-0.02,0.032-0.031c0.012-0.015,0.015-0.027,0.032-0.037c0.011-0.007,0.017-0.011,0.023-0.022
+  c0.008-0.014,0.013-0.007,0.027-0.012c0.01-0.003,0.017-0.013,0.027-0.015C-19.999,57.972-19.986,57.974-19.994,57.988z
+  M-20.192,58.127c0,0.003,0.001,0.006,0.003,0.009c-0.004,0.007-0.008,0.014-0.013,0.019L-20.192,58.127z M-20.079,57.926
+  c-0.013,0.008-0.028,0.019-0.038,0.032c-0.006,0.009-0.006,0.02-0.01,0.029c-0.003,0.006-0.01,0.011-0.014,0.016
+  c-0.004,0.005-0.006,0.012-0.011,0.017c-0.008,0.009-0.019,0.018-0.028,0.025c-0.007,0.005-0.027,0.013-0.027,0.022
+  c0.003,0.002,0.005,0.002,0.008,0.001c-0.006,0.006-0.01,0.015-0.015,0.022c-0.011,0.014-0.026,0.026-0.038,0.037
+  c-0.018,0.015-0.049,0.026-0.071,0.035c-0.023,0.01-0.045,0.02-0.063,0.038c-0.011,0.012-0.022,0.026-0.035,0.036
+  c-0.016,0.012-0.033,0.022-0.048,0.034c-0.005,0.004-0.011,0.01-0.017,0.015c-0.007,0.005-0.022,0.01-0.026,0.019
+  c-0.008,0.022,0.037-0.003,0.043-0.007s0.02-0.012,0.022,0c0.004,0.014-0.016,0.017-0.023,0.02c-0.009,0.004-0.017,0.01-0.026,0.014
+  c-0.01,0.004-0.02,0.009-0.029,0.014c-0.008,0.004-0.017,0.008-0.026,0.01c-0.005,0.002-0.01,0.003-0.016,0.006
+  c-0.006,0.002-0.017,0.005-0.022,0.008c-0.005,0.003-0.005,0.007-0.01,0.01c-0.004,0.002-0.011,0.004-0.016,0.007
+  c-0.007,0.003-0.015,0.006-0.022,0.009c-0.021,0.009-0.042,0.023-0.054,0.043c-0.008,0.015-0.009,0.033-0.028,0.033
+  c-0.006,0-0.012-0.001-0.017,0c-0.006,0.001-0.007,0.003-0.012,0.004c-0.009,0.003-0.017,0.004-0.026,0.007
+  c-0.004,0.002-0.007,0.002-0.012,0.004c-0.005,0.002-0.01,0.006-0.015,0.007c-0.012,0.003-0.021-0.002-0.033,0.004
+  c-0.01,0.004-0.02,0.009-0.028,0.016c-0.019,0.015-0.047,0.017-0.064,0.034c-0.009,0.01-0.016,0.021-0.027,0.028
+  c-0.009,0.005-0.019,0.006-0.027,0.012c-0.012,0.006-0.021,0.013-0.033,0.019c-0.013,0.006-0.019,0.01-0.033,0.013
+  c-0.011,0.003-0.022,0.006-0.033,0.01c-0.009,0.004-0.017,0.004-0.027,0.005c-0.009,0.002-0.018,0.007-0.027,0.011
+  c-0.01,0.005-0.021,0.007-0.031,0.012c-0.032,0.016-0.07,0.025-0.098,0.05c-0.01,0.008-0.022,0.016-0.034,0.021
+  c-0.006,0.003-0.011,0.002-0.017,0.004c-0.004,0.002-0.005,0.005-0.01,0.006s-0.012-0.001-0.017,0c-0.006,0-0.008,0.003-0.012,0.004
+  c-0.012,0.003-0.015,0.004-0.024,0.013c-0.008,0.009-0.013,0.009-0.023,0.014c-0.02,0.008-0.039,0.019-0.058,0.029
+  c-0.024,0.012-0.049,0.024-0.073,0.032c-0.018,0.006-0.032,0.014-0.048,0.024c-0.02,0.012-0.049,0.018-0.072,0.024
+  c-0.011,0.003-0.022-0.001-0.032,0.001c-0.012,0.002-0.022,0.012-0.033,0.016c-0.012,0.003-0.067,0.017-0.048-0.015
+  c0.004-0.007,0.016-0.01,0.022-0.016c0.008-0.006,0.013-0.015,0.019-0.023c0.012-0.015,0.022-0.03,0.033-0.045
+  c0.008-0.01,0.009-0.025,0.018-0.036c0.003,0,0.006-0.001,0.009-0.001c0.002-0.004,0.004-0.007,0.007-0.009
+  c0.004-0.004,0.01-0.011,0.016-0.011c0.006-0.001,0.013,0.006,0.022,0.004c0.009-0.001,0.014-0.006,0.02-0.012
+  c0.011-0.011,0.017-0.026,0.029-0.037c0.014-0.014,0.032-0.019,0.049-0.028c0.016-0.009,0.026-0.025,0.042-0.033
+  c0.013-0.007,0.028-0.012,0.039-0.021c0.014-0.012,0.016-0.025,0.025-0.039c-0.011-0.008-0.015-0.008-0.029-0.011
+  c-0.011-0.002-0.025-0.012-0.039-0.01c-0.006,0.002-0.011,0.005-0.017,0.006c-0.006,0.002-0.015,0-0.021,0
+  c-0.014,0-0.03-0.002-0.043,0.001c-0.011,0.003-0.023,0.013-0.034,0.02c-0.013,0.009-0.028,0.011-0.043,0.016
+  c-0.027,0.008-0.046,0.02-0.07,0.035c-0.009,0.006-0.019,0.013-0.029,0.019c-0.013,0.008-0.024,0.013-0.037,0.019
+  c-0.013,0.007-0.026,0.012-0.038,0.02c-0.013,0.008-0.029,0.008-0.044,0.013c-0.012,0.004-0.022,0.014-0.034,0.019
+  c-0.012,0.007-0.027,0.01-0.041,0.013c-0.004,0.002-0.006,0.004-0.012,0.005c-0.007,0.001-0.015,0-0.022,0
+  c-0.014,0-0.022,0.008-0.037,0.004c-0.002-0.011,0.008-0.014,0.016-0.019c0.008-0.005,0.013-0.013,0.021-0.018
+  c0.015-0.008,0.029-0.019,0.044-0.027c0.007-0.004,0.014-0.006,0.022-0.009c0.012-0.006,0.016-0.017,0.025-0.025
+  c0.014-0.013,0.026-0.017,0.034-0.035c-0.011-0.015-0.046,0.004-0.059,0.01c-0.022,0.011-0.044,0.019-0.065,0.03
+  c-0.024,0.013-0.048,0.017-0.071,0.03c-0.011,0.007-0.016,0.008-0.027,0.011c-0.007,0.002-0.01,0.004-0.017,0.004
+  c-0.007,0.001-0.014,0-0.022,0.002c-0.021,0.005-0.042,0.014-0.06,0.024c-0.007,0.005-0.018,0.007-0.027,0.011
+  c-0.019,0.008-0.036,0.022-0.054,0.033c-0.008,0.005-0.018,0.009-0.027,0.013c-0.01,0.005-0.019,0.01-0.027,0.015
+  c-0.008,0.004-0.015,0.008-0.022,0.013c-0.011,0.006-0.019,0.012-0.029,0.019c-0.004,0.003-0.01,0.003-0.015,0.006
+  c-0.005,0.003-0.011,0.009-0.016,0.012c-0.013,0.009-0.021,0.022-0.033,0.032c-0.007,0.006-0.015,0.017-0.023,0.021
+  c-0.004,0.002-0.009,0-0.014,0.002c-0.004,0.001-0.012,0.008-0.016,0.011c-0.013,0.009-0.025,0.022-0.039,0.03
+  c-0.009,0.004-0.018,0.008-0.026,0.013c-0.004,0.003-0.008,0.007-0.012,0.01c-0.009,0.006-0.008,0.007-0.013,0.015
+  c-0.012,0.018-0.013,0.04-0.019,0.061c-0.003,0.011,0,0.019-0.005,0.028c-0.005,0.011-0.014,0.02-0.022,0.028
+  c-0.012,0.011-0.023,0.024-0.035,0.035c-0.016,0.014-0.035,0.024-0.049,0.038c-0.006,0.006-0.007,0.011-0.011,0.017
+  c-0.005,0.006-0.013,0.009-0.019,0.013c-0.019,0.013-0.034,0.03-0.053,0.042c-0.017,0.011-0.029,0.023-0.042,0.037
+  c-0.013,0.013-0.028,0.019-0.043,0.029c-0.017,0.01-0.035,0.02-0.054,0.027c-0.01,0.004-0.017,0.003-0.027,0.005
+  c-0.012,0.002-0.021,0.016-0.033,0.021c-0.006,0.003-0.015,0.004-0.02,0.008c-0.008,0.006-0.016,0.013-0.024,0.019
+  c-0.015,0.011-0.032,0.024-0.049,0.033c-0.016,0.009-0.036,0.019-0.053,0.03c-0.014,0.009-0.028,0.02-0.044,0.027
+  c-0.015,0.006-0.029,0.005-0.044,0.013c-0.01,0.006-0.019,0.012-0.027,0.018c-0.017,0.012-0.036,0.023-0.055,0.033
+  c-0.027,0.015-0.052,0.037-0.081,0.05c-0.016,0.007-0.032,0.011-0.048,0.016c-0.014,0.005-0.027,0.017-0.043,0.016
+  c0.002-0.002,0.004-0.003,0.004-0.006l-0.011-0.006c-0.001,0.012-0.013,0.005-0.011-0.005c0.001-0.007,0.01-0.013,0.015-0.017
+  c0.013-0.014,0.03-0.021,0.045-0.033c0.008-0.007,0.018-0.014,0.026-0.021c0.007-0.006,0.014-0.008,0.023-0.012
+  c0.025-0.011,0.037-0.038,0.06-0.053c0.01-0.007,0.014-0.005,0.02-0.016c0.005-0.009,0.014-0.02,0.017-0.029
+  c0.006-0.018-0.006-0.036-0.021-0.046c-0.016-0.013-0.038-0.013-0.033-0.04c0.002-0.011,0.009-0.021,0.011-0.032
+  c0.003-0.011,0.009-0.032,0.005-0.042c-0.021,0.007-0.03,0.041-0.037,0.059c-0.013,0.034-0.034,0.067-0.066,0.086
+  c-0.019,0.012-0.038,0.023-0.06,0.032c-0.012,0.004-0.012,0.005-0.017,0.017c-0.004,0.01-0.001,0.03-0.009,0.033
+  c-0.008,0.003-0.025,0-0.033,0h-0.033c-0.01,0-0.023,0.002-0.033,0s-0.022-0.009-0.032-0.012c-0.015-0.005-0.029-0.013-0.044-0.016
+  c-0.01-0.001-0.022,0.001-0.033,0.001c-0.01,0-0.022-0.002-0.032,0.001c-0.007,0.001-0.009,0.005-0.017,0.004
+  c-0.008,0-0.009-0.004-0.016-0.006c-0.01-0.002-0.022,0.002-0.033,0.001c-0.017-0.003-0.007-0.008-0.01-0.022
+  c-0.001-0.003-0.004-0.01-0.006-0.011c-0.006-0.007-0.002-0.002-0.011-0.005c-0.011-0.005-0.02-0.007-0.033-0.002
+  c-0.009,0.004-0.018,0.007-0.027,0.012c-0.009,0.005-0.017,0.013-0.026,0.018c-0.005,0.003-0.012,0.003-0.016,0.005
+  c-0.003,0.002-0.005,0.006-0.008,0.009c-0.011,0.008-0.023,0.012-0.037,0.012c-0.016,0-0.049,0.006-0.064-0.001
+  c-0.021-0.011-0.008-0.04-0.012-0.059c-0.001-0.006-0.004-0.01-0.006-0.016c-0.001-0.005,0.001-0.011,0.001-0.017
+  c-0.001-0.01-0.006-0.015-0.006-0.027c0-0.021-0.011-0.041-0.016-0.059c-0.008-0.025-0.017-0.048-0.038-0.066
+  c-0.014-0.011-0.031-0.034-0.049-0.038c-0.005-0.002-0.011,0.001-0.016-0.001c-0.006-0.002-0.012-0.006-0.017-0.009
+  c-0.009-0.004-0.019-0.007-0.028-0.01c-0.011-0.004-0.02-0.007-0.032-0.007c-0.013,0-0.026,0.002-0.038-0.004
+  c-0.036-0.017-0.003-0.039,0.012-0.056c0.017-0.018,0.031-0.037,0.048-0.053c0.019-0.019,0.043-0.023,0.066-0.034
+  c0.019-0.01,0.032-0.027,0.05-0.037c0.019-0.011,0.036-0.025,0.051-0.041c0.008-0.008,0.016-0.017,0.022-0.026
+  c0.003-0.003,0.01-0.012,0.012-0.016c0.002-0.007,0-0.014,0.002-0.022c0.002-0.009,0.008-0.018,0.01-0.027
+  c0.002-0.012-0.002-0.016,0.006-0.027c0.014-0.019,0.043-0.032,0.064-0.042c0.022-0.011,0.041-0.028,0.051-0.051
+  c0.002-0.006,0.002-0.01,0.003-0.016c0.002-0.005,0.005-0.006,0.006-0.011c0.003-0.013-0.002-0.02,0.006-0.032
+  c0.011-0.014,0.024-0.019,0.038-0.029c0.01-0.008,0.019-0.016,0.028-0.025c0.008-0.006,0.013-0.012,0.022-0.017
+  c0.015-0.009,0.03-0.009,0.046-0.015c0.021-0.008,0.041-0.016,0.061-0.023c0.02-0.008,0.038-0.016,0.054-0.029
+  c0.01-0.007,0.02-0.013,0.029-0.02c0.01-0.008,0.02-0.016,0.031-0.021c0.017-0.007,0.055-0.009,0.055-0.034
+  c0-0.024-0.032-0.026-0.049-0.023c-0.023,0.005-0.048-0.003-0.071,0.003c-0.011,0.002-0.02,0.006-0.033,0.004
+  c-0.011-0.001-0.02-0.008-0.032-0.006c-0.006,0.001-0.011,0.005-0.016,0.007c-0.007,0.003-0.011,0.003-0.017,0.004
+  c-0.005,0.001-0.006,0.007-0.011,0.005c-0.003-0.001-0.008-0.009-0.01-0.012c0.003-0.005,0.008-0.015,0.009-0.021
+  c0.002-0.011-0.001-0.015-0.005-0.025c-0.005-0.01-0.002-0.017-0.004-0.028c-0.003-0.014-0.012-0.024-0.016-0.037
+  c-0.005-0.022,0.003-0.04,0.006-0.06c0.001-0.007,0.005-0.003,0.003-0.012c-0.001-0.007-0.006-0.007-0.01-0.012
+  c-0.009-0.011-0.014-0.022-0.018-0.036c0-0.002-0.003-0.009-0.004-0.012c-0.001-0.006-0.001-0.007-0.003-0.012
+  c-0.006-0.011-0.012-0.014-0.003-0.026c0.008-0.01,0.018-0.012,0.027-0.018c0.013-0.008,0.024-0.021,0.036-0.031
+  c0.015-0.015,0.034-0.027,0.048-0.043c0.02-0.024,0.042-0.05,0.068-0.066c0.018-0.011,0.034-0.02,0.051-0.031
+  c0.019-0.014,0.025-0.041,0.044-0.055c0.009-0.006,0.024-0.004,0.032-0.01c0.006-0.005,0.01-0.013,0.015-0.019
+  c0.018-0.022,0.038-0.043,0.057-0.063c0.007-0.008,0.014-0.016,0.02-0.024c0.009-0.012,0.021-0.021,0.029-0.032
+  c0.012-0.016,0.02-0.036,0.025-0.056c0.002-0.013,0.002-0.023,0.006-0.037c0.004-0.009,0.004-0.012,0.012-0.02
+  c0.006-0.005,0.011-0.011,0.016-0.017c0.016-0.017,0.037-0.028,0.052-0.044c0.01-0.01,0.02-0.018,0.03-0.028
+  c0.023-0.024,0.05-0.041,0.074-0.062c0.01-0.008,0.019-0.015,0.029-0.023c0.004-0.003,0.006-0.008,0.01-0.011
+  c0.007-0.005,0.015-0.007,0.022-0.012c0.024-0.018,0.048-0.035,0.071-0.053c0.019-0.015,0.037-0.027,0.06-0.036
+  c0.011-0.004,0.02-0.002,0.031-0.005c0.014-0.004,0.014-0.015,0.023,0.002c0.01,0.018,0.024,0.036,0.045,0.042
+  c0.01,0.003,0.02,0.002,0.031,0.006c0.014,0.006,0.024,0.006,0.038,0.006s0.025-0.005,0.039-0.006c0.005,0,0.011,0.001,0.016,0.001
+  c0.008-0.002,0.011-0.01,0.021-0.005c-0.003,0.009-0.015,0.01-0.022,0.016c-0.008,0.009-0.014,0.021-0.022,0.031
+  c-0.01,0.011-0.016,0.022-0.028,0.032c-0.013,0.011-0.027,0.013-0.026,0.034c0.001,0.01,0.004,0.021,0.013,0.026
+  c0.004,0.003,0.024,0.007,0.029,0.007c-0.007,0.004-0.012,0.012-0.008,0.021c0.006,0.01,0.023,0.006,0.033,0.006
+  c0.02,0,0.036-0.007,0.053-0.015c0.008-0.004,0.01-0.002,0.018-0.008c0.009-0.007,0.015-0.01,0.025-0.013
+  c0.018-0.006,0.036-0.014,0.054-0.017c0.016-0.003,0.034-0.001,0.05-0.001c0.014,0,0.031-0.004,0.044-0.001
+  c0.01,0.003,0.021,0.005,0.029,0.006c0.009-0.007,0.013-0.004,0.021,0.001c0.012,0.008,0.006,0.015,0.015,0.022
+  c0.016,0.014,0.034,0.001,0.045-0.011c0.008-0.008,0.016-0.017,0.026-0.023c0.016-0.01,0.036-0.003,0.054-0.009
+  c0.02-0.007,0.026-0.027,0.049-0.029c0.011-0.001,0.017,0.004,0.027,0.006c0.028,0.006,0.059-0.005,0.087-0.01
+  c0.024-0.004,0.049-0.008,0.072-0.019c0.018-0.009,0.034-0.016,0.054-0.022c0.022-0.007,0.025-0.001,0.041,0.012
+  c-0.007,0.011-0.02,0.004-0.03,0.006c-0.015,0.002-0.03,0.01-0.043,0.018c-0.011,0.007-0.021,0.009-0.034,0.013
+  c-0.014,0.005-0.027,0.012-0.041,0.018c0.011,0,0.024,0.002,0.035,0c0.018-0.003,0.038-0.01,0.056-0.015
+  c0.01-0.003,0.02-0.005,0.031-0.008c0.004-0.001,0.006-0.004,0.012-0.004c0.008-0.002,0.014-0.002,0.022-0.005
+  c0.012-0.003,0.025,0.001,0.038-0.002c0.013-0.003,0.024-0.004,0.038-0.004c0.011,0,0.022,0.001,0.033-0.001
+  c0.013-0.003,0.025-0.005,0.038-0.005c0.007,0,0.022,0.004,0.025-0.005c-0.003-0.011-0.016-0.013-0.025-0.011
+  c-0.006,0.001-0.011,0.006-0.017,0.006c-0.004,0-0.007-0.005-0.01-0.006c-0.008-0.003-0.021-0.002-0.016-0.015
+  c0.002-0.006,0.018-0.013,0.023-0.016c0.007-0.003,0.023-0.013,0.031-0.013c0.005,0,0.005,0.005,0.01,0.006s0.012,0,0.017,0
+  c0.015,0,0.033-0.002,0.047-0.007c0.007-0.002,0.012-0.006,0.017-0.008c0.009-0.004,0.019,0,0.028-0.002
+  c-0.001-0.007-0.012-0.014-0.017-0.019c0.023,0.018,0.06-0.013,0.072-0.029c0.009-0.014,0.017-0.019,0.032-0.026
+  c0.014-0.007,0.026-0.009,0.04-0.017c0.003-0.002,0.011-0.006,0.014-0.007c0.004,0.001,0.008,0.001,0.012,0.001
+  c0.003,0,0.005-0.002,0.006-0.005c0.007-0.001,0.014,0.001,0.021,0c0.012-0.003,0.008-0.008,0.011-0.017
+  c0.005-0.027,0.031-0.045,0.047-0.065c0.019-0.024,0.044-0.046,0.074-0.054c0.006-0.001,0.013-0.001,0.02-0.001
+  c0.008,0,0.012-0.003,0.018-0.004c0.006-0.002,0.013-0.001,0.019-0.002c0.006-0.002,0.011-0.009,0.017-0.01
+  c0.007-0.002,0.014,0.001,0.021-0.001c0.004-0.002,0.014-0.009,0.017-0.011c0.006-0.006,0.012-0.027,0.022-0.027
+  c0.006,0,0.008,0.007,0.012,0.01c0.004,0.003,0.011,0.005,0.016,0.007c0.011,0.006,0.024,0.01,0.037,0.012
+  c0,0.008,0.006,0.013,0.006,0.02c0.002,0.011,0.001,0.018,0.006,0.028c0,0.003,0.001,0.005,0.004,0.007
+  c0.001,0.004-0.001,0.01,0.002,0.014c0.003,0.004,0.017,0.011,0.022,0.016c0.006,0.005,0.014,0.006,0.019,0.013
+  c0.001,0.003,0.002,0.006,0.003,0.009c0.002,0.003,0.006,0.004,0.008,0.007c0.005,0.006,0.004,0.015,0.007,0.021
+  c0.005,0.013,0.011,0.011,0.025,0.011c-0.001,0.013,0.039,0.002,0.046,0c0.009-0.004,0.018-0.004,0.027-0.011
+  c0.012-0.008,0.019-0.022,0.033-0.029c0.02-0.01,0.044-0.002,0.065,0.002s0.03-0.022,0.053-0.015
+  c0.007,0.002,0.015,0.007,0.018,0.014c0.002,0.007-0.001,0.016,0.001,0.023c0.002,0.006,0.004,0.009,0.004,0.016
+  c0,0.023-0.016,0.038-0.005,0.06c0.005,0.012,0.005,0.014-0.002,0.027c-0.006,0.011-0.009,0.014-0.009,0.027
+  s0.003,0.021,0.005,0.033c0.002,0.006,0.002,0.023-0.003,0.028c0.013,0.001,0.026-0.023,0.029-0.034
+  c0.005-0.016,0.013-0.037,0.012-0.054c0-0.017,0.007-0.03,0.018-0.042c0.004-0.005,0.01-0.009,0.014-0.014
+  c0-0.003,0.001-0.005,0.002-0.008c0.002-0.002,0.012-0.004,0.015-0.005c0.007-0.003,0.01-0.006,0.015-0.009
+  c0.008-0.004,0.014-0.003,0.023-0.003c0.012-0.001,0.02-0.001,0.028,0.01c0.003,0.005,0.01,0.016,0.011,0.022
+  c0.002,0.009-0.005,0.018-0.006,0.027c-0.001,0.009,0,0.018,0,0.028c0,0.021-0.005,0.047-0.015,0.066
+  c-0.008,0.015-0.015,0.026-0.019,0.042c-0.002,0.011-0.006,0.016-0.003,0.027c0.003,0.01,0.003,0.018,0.004,0.028
+  c0.001,0.007,0.004,0.009,0.006,0.016c0.002,0.008,0,0.019,0,0.027c0.001,0.022,0.011,0.034,0.027,0.048
+  c0.013,0.011,0.026,0.022,0.038,0.033c0.007,0.005,0.011,0.01,0.016,0.017c0.006,0.008,0.008,0.014,0.012,0.022
+  c0.008,0.012,0.025,0.021,0.031,0.034c0.005,0.01-0.003,0.012-0.005,0.02c-0.002,0.008-0.001,0.013-0.004,0.021
+  c0.006,0.004,0.017,0.021,0.016,0.029c-0.001,0.006-0.007,0.006-0.012,0.01c-0.004,0.004-0.007,0.011-0.01,0.017
+  c-0.012,0.019-0.024,0.043-0.045,0.053c-0.005,0.002-0.011,0.001-0.016,0.005c-0.005,0.004-0.002,0.006-0.006,0.011
+  c-0.007,0.01-0.01,0.015-0.01,0.028c0.001,0.012,0.007,0.018,0.011,0.027c0.006,0.012,0.005,0.024,0.01,0.035
+  c0.008,0.017,0.024,0.032,0.019,0.053c-0.002,0.01-0.013,0.02-0.006,0.031c0.007,0.01,0.022,0.008,0.032,0.006
+  c0.012-0.003,0.022-0.01,0.032-0.017c0.011-0.008,0.021-0.01,0.033-0.015c0.025-0.009,0.051-0.011,0.076-0.017
+  c0.025-0.006,0.047-0.015,0.071-0.022c0.026-0.008,0.044-0.026,0.064-0.044c0.006-0.005,0.019-0.011,0.022-0.016
+  c0.004-0.005,0.002-0.025,0-0.03c-0.003-0.01-0.014-0.017-0.016-0.029c-0.001-0.013,0.012-0.018,0.022-0.023
+  c0.013-0.006,0.018-0.002,0.029,0c0.009,0.002,0.022,0.003,0.032,0.002c0.009-0.001,0.014-0.006,0.023-0.01
+  c0.011-0.006,0.018-0.012,0.02,0.004c0.002,0.015-0.002,0.021-0.01,0.033c-0.006,0.009-0.006,0.018-0.013,0.026
+  c-0.016,0.018-0.025,0.025-0.015,0.05c0.003,0.009,0.003,0.03,0.01,0.033c0.014,0.006,0.035-0.004,0.045-0.012
+  c0.017-0.015,0.024-0.052,0.048-0.059c0.005-0.002,0.011,0.001,0.017,0c0.008-0.001,0.011-0.006,0.017-0.01
+  c0.005-0.002,0.011-0.004,0.015-0.006c0.005-0.003,0.008-0.007,0.012-0.01c0.006-0.004,0.014-0.003,0.02-0.008
+  c0.004-0.003,0.007-0.007,0.01-0.011c0.008-0.008,0.019-0.013,0.027-0.02c-0.006,0.01-0.004,0.021-0.01,0.032
+  C-20.058,57.907-20.066,57.918-20.079,57.926z M-20.496,56.942c-0.016,0.005-0.024,0.014-0.022,0.033l-0.011-0.017
+  c-0.018,0.024-0.04-0.035-0.048-0.043c-0.006-0.005-0.01-0.004-0.012-0.011c-0.002-0.007,0.001-0.013,0.004-0.018
+  c0.008-0.011,0.022-0.015,0.034-0.019c0.03-0.009,0.049-0.033,0.077-0.045c0.011-0.005,0.025-0.008,0.037-0.011
+  c0.006,0.001,0.01,0.001,0.015-0.001c0.007-0.003,0.014-0.006,0.021-0.009c0.01-0.002,0.019-0.004,0.029-0.008
+  c0.012-0.004,0.023-0.004,0.034,0.007c0.014,0.014,0.011,0.028,0.005,0.044c-0.01,0.026-0.034,0.038-0.056,0.053
+  c-0.008,0.005-0.016,0.013-0.025,0.018c-0.013,0.006-0.03,0.01-0.044,0.015C-20.471,56.934-20.484,56.938-20.496,56.942z
+  M-20.562,57.008c0.01,0.008,0.021,0.015,0.033,0.021c0.015,0.007,0.025,0.007,0.034,0.022c0.015,0.022,0.011,0.039,0,0.061
+  c-0.003,0.006-0.004,0.013-0.008,0.019c-0.005,0.009-0.014,0.015-0.02,0.023c-0.008,0.014-0.006,0.029-0.018,0.042
+  c-0.016,0.018-0.038,0.034-0.064,0.028c-0.019-0.005-0.028-0.016-0.042-0.028c-0.007-0.005-0.016-0.01-0.022-0.016
+  c-0.002-0.002-0.004-0.004-0.005-0.006c-0.005-0.002-0.009-0.001-0.013-0.003c-0.008-0.004-0.035-0.013-0.038-0.024v0.013
+  c-0.005-0.017-0.059-0.055-0.053-0.07c0.002-0.002,0.004-0.003,0.006-0.005c0.002-0.004,0.003-0.008,0.005-0.011
+  c0.005-0.008,0.008-0.014,0.011-0.023c0.003-0.009,0.006-0.017,0.004-0.027c-0.002-0.012-0.008-0.019-0.004-0.032
+  c0.007-0.023,0.026-0.02,0.045-0.024c0.011-0.002,0.018-0.005,0.03-0.004c0.012,0,0.021-0.007,0.033-0.006
+  c0.015,0.001,0.025,0.015,0.037,0.023c0.009,0.006,0.018,0.007,0.027,0.011C-20.577,56.996-20.569,57.003-20.562,57.008z
+  M-20.741,57.17c0.003,0.011,0.002,0.033-0.001,0.043c-0.021,0.002-0.04,0.018-0.063,0.011l-0.001-0.005l-0.006-0.005
+  c0.001,0.004,0.001,0.007-0.001,0.01c-0.007-0.001-0.018-0.015-0.026-0.019c-0.008-0.005-0.013-0.007-0.022-0.007
+  c-0.003,0-0.007,0-0.011,0c-0.005,0-0.008,0.003-0.012,0.004c-0.007,0.001-0.013,0.001-0.02,0.001c-0.012,0-0.012-0.001-0.021-0.007
+  c-0.011-0.007-0.022-0.014-0.033-0.021c0-0.023,0.06-0.031,0.075-0.032c0.005,0,0.012-0.001,0.017,0
+  c0.007,0.002,0.008,0.007,0.016,0.006c0.004,0,0.007-0.004,0.011-0.006c0.005-0.002,0.011-0.003,0.016-0.005
+  c0.013-0.006,0.024-0.012,0.037-0.01c0.01,0.002,0.019,0.009,0.028,0.015C-20.748,57.15-20.743,57.159-20.741,57.17z
+  M-24.165,56.011c-0.325-0.11-1.03,0.279-0.976-0.33c0.055-0.609,0.057-0.298,0.086-0.447c0.107-0.033,0.215-0.065,0.322-0.098
+  c-0.002-0.002-0.005-0.003-0.007-0.007c-0.002-0.006,0-0.011-0.001-0.018c-0.001-0.007-0.003-0.013-0.003-0.021
+  c0-0.011,0.004-0.022,0.005-0.033c0.001-0.006-0.001-0.009-0.003-0.013c-0.001-0.006,0.001-0.013,0.002-0.018
+  c0.002-0.005,0.003-0.011,0.004-0.016c0-0.005-0.001-0.01,0-0.015c0-0.006,0.005-0.01,0.007-0.015
+  c0.002-0.007,0.002-0.012,0.003-0.019c0.001-0.009,0.008-0.014,0.012-0.023c0.003-0.004,0.004-0.012,0.008-0.015
+  c0.003-0.003,0.005-0.002,0.008-0.003c0.004-0.002,0.007-0.007,0.01-0.01c0.003-0.003,0.004-0.008,0.007-0.011
+  c0.004-0.003,0.008-0.004,0.012-0.006c0.01-0.006,0.015-0.019,0.025-0.023c0.013-0.006,0.025-0.015,0.036-0.024
+  c0.006-0.005,0.011-0.009,0.018-0.013c0.005-0.002,0.006-0.002,0.01-0.002c0.006-0.001,0.01-0.005,0.015-0.008
+  c0.003-0.001,0.007-0.003,0.01-0.005c0.003-0.001,0.006-0.004,0.009-0.005s0.005,0,0.008,0c0.004-0.001,0.007-0.002,0.01-0.003
+  c0.005-0.001,0.007,0,0.012-0.002c0.002-0.002,0.005-0.005,0.008-0.006c0.002-0.002,0.003-0.004,0.005-0.005
+  c0.005-0.003,0.006-0.002,0.011-0.002c0.005-0.001,0.013-0.005,0.018-0.008c0.007-0.004,0.014-0.009,0.02-0.013
+  c0.005-0.003,0.01-0.006,0.016-0.008c0.005-0.002,0.012-0.002,0.018-0.005c0.005-0.004,0.012-0.007,0.018-0.011
+  c0.005-0.003,0.008-0.006,0.015-0.007c0.012-0.001,0.028-0.002,0.039,0.003c0.006,0.004,0.009,0.006,0.012,0.013
+  c0.002,0.004,0.004,0.006,0.006,0.01c0.002,0.003,0.001,0.005,0.002,0.008c0.001,0.002,0.002,0.002,0.003,0.005
+  c0.001,0.005-0.001,0.012-0.001,0.018c0.001,0.005-0.002,0.008-0.002,0.013c0,0.006,0.005,0.008,0.01,0.009
+  c0.007,0.002,0.011,0.005,0.014,0.011c0.001,0.003,0.001,0.005,0.002,0.008c0,0.003,0.004,0.007,0.004,0.01
+  c0.001,0.004-0.002,0.008-0.002,0.013c0,0.005,0,0.008,0.003,0.013c0.005,0.01,0.013,0.018,0.022,0.026
+  c0.003,0.002,0.002,0.004,0.006,0.005c0.004,0,0.006-0.001,0.008-0.003c0.007-0.006,0.011-0.018,0.012-0.026
+  c0.001-0.006-0.004-0.014-0.007-0.019c-0.004-0.008-0.009-0.016-0.014-0.024c-0.005-0.008-0.013-0.016-0.014-0.026
+  c-0.001-0.01,0.008-0.019,0.01-0.028c0.001-0.007-0.001-0.012,0.008-0.013c0.005-0.001,0.01,0.001,0.015-0.001
+  c0.005-0.001,0.009-0.004,0.013-0.006c0.004-0.003,0.007-0.007,0.011-0.011c0.003,0.003,0.008,0.004,0.012,0.005
+  c0.005,0.002,0.01,0.005,0.016,0.006c0.008,0.002,0.015,0,0.023-0.003c0.007-0.002,0.01-0.005,0.018-0.005
+  c0.017,0,0.033,0,0.049-0.008c0.013-0.007,0.026-0.008,0.04-0.008c0.007,0,0.012-0.003,0.018-0.005
+  c0.006-0.001,0.01-0.001,0.016-0.003c0.005-0.002,0.009-0.005,0.015-0.005c0.007,0,0.014,0,0.021,0c0.005,0,0.012,0.002,0.018,0
+  c0.004-0.001,0.009-0.004,0.013-0.004c0.008-0.002,0.024,0,0.03,0.007c0.001,0.002,0,0.005,0,0.008c0,0.002,0.002,0.003,0.002,0.005
+  c0.001,0.005,0.001,0.01,0.001,0.015s0.001,0.01-0.001,0.015c0,0.003-0.002,0.006-0.002,0.008c-0.002,0.004-0.001,0.007-0.002,0.011
+  c-0.001,0.004-0.006,0.006-0.006,0.012c0,0.006,0.004,0.011,0.008,0.014c0.01,0.007,0.021,0.008,0.031,0.012
+  c0.009,0.003,0.021,0.004,0.031,0.003c0.021-0.002,0.017-0.023,0.03-0.032c0.008-0.006,0.019-0.007,0.027-0.012
+  c0.004-0.003,0.009-0.007,0.012-0.011c0.004-0.006,0.005-0.01,0.012-0.009c0.001,0.001,0.002,0.002,0.004,0.002
+  c0.003,0,0.003-0.001,0.005-0.002c0.005-0.002,0.009-0.005,0.013-0.008c0.004-0.004,0.005-0.009,0.01-0.013
+  c0.005-0.004,0.007-0.002,0.013-0.003c0.011-0.002,0.019-0.01,0.031-0.01c0.003,0,0.01,0.001,0.007-0.005
+  c-0.001-0.001-0.006-0.004-0.007-0.005c-0.003-0.003-0.005-0.005-0.008-0.006c0.001-0.006,0.008-0.004,0.012-0.004
+  c0.008-0.002,0.014-0.003,0.021-0.003c0.012,0,0.027,0.002,0.039,0c0.011-0.002,0.02-0.014,0.025-0.023
+  c0.003-0.005,0.004-0.009,0.009-0.013s0.011-0.005,0.017-0.005c0.01,0,0.018,0.004,0.028,0.005c0.005,0,0.009,0.002,0.014,0.004
+  c0.006,0.004,0.01,0.003,0.017,0.003c0.005,0.001,0.003,0,0.005,0.003c0.001,0.001,0.003,0.006,0.004,0.008
+  c0.003,0.006,0.006,0.012,0.007,0.018c0.002,0.008,0.001,0.016,0.002,0.024c0.001,0.007,0.003,0.012,0.003,0.02
+  c0,0.004-0.001,0.01,0,0.014c0,0.001,0.001,0.001,0.001,0.002c0.099-0.03-0.143,0.256,0.297-0.09s0.336,0.817-0.066,1.025
+  C-23.693,55.914-23.874,55.909-24.165,56.011z M-24.181,56.017c0.005-0.002,0.011-0.004,0.016-0.006
+  c0.017,0.006,0.034,0.012,0.051,0.018L-24.181,56.017z M-24.607,55.943l0.426,0.074c-0.05,0.017-0.099,0.035-0.148,0.052
+  C-24.422,56.027-24.515,55.985-24.607,55.943z M-33.449,52.473c0.015,0.018,0.025,0.032,0.022,0.057
+  c-0.003,0.021-0.001,0.046-0.026,0.05c-0.001-0.002-0.003-0.003-0.006-0.003h-0.005c-0.002-0.02-0.023-0.04-0.026-0.063
+  c-0.002-0.014,0.012-0.061,0.033-0.037C-33.455,52.475-33.452,52.475-33.449,52.473z M-27.922,53.12L-27.922,53.12L-27.922,53.12
+  L-27.922,53.12z M-25.706,56.522c-0.279,0.349-0.558,0.698-0.837,1.047c-0.001,0.012,0.003,0.025-0.001,0.036
+  c-0.004,0.013-0.015,0.02-0.02,0.032c-0.01,0.022-0.003,0.045-0.005,0.068c-0.003,0.021-0.017,0.037-0.022,0.058
+  c-0.007,0.022-0.001,0.045-0.004,0.068c-0.002,0.011-0.009,0.02-0.011,0.031c-0.002,0.012,0.001,0.025,0,0.037
+  c-0.002,0.019-0.012,0.037-0.015,0.058c-0.002,0.022,0.005,0.042,0.01,0.063c0.006,0.027,0.006,0.093,0.041,0.1
+  c0.004,0.025,0.002,0.056-0.031,0.057c-0.012,0.001-0.021-0.008-0.035-0.004c-0.014,0.003-0.024,0.019-0.038,0.02
+  c-0.024,0.002-0.036-0.029-0.058-0.027c-0.003,0-0.002,0.003-0.003,0.003c-0.019,0.067-0.038,0.134-0.057,0.201
+  c0.006,0.01,0.013,0.019,0.014,0.026c0.004,0.015-0.002,0.032-0.017,0.044c-0.005,0.005-0.012-0.001-0.017,0.002
+  c-0.092,0.323-0.183,0.646-0.274,0.969c0.091,0.148,0.182,0.296,0.274,0.444c-0.291-0.117-0.581-0.234-0.872-0.352
+  c0.122,0.03,0.231,0.045,0.318,0.038l-1.097-0.379c0,0.006-0.007,0.011-0.004,0.022c0,0.001,0.001,0.003,0.002,0.004
+  c0.26,0.105,0.521,0.21,0.781,0.315c-0.216-0.052-0.483-0.162-0.78-0.312c0.002,0.006,0.004,0.014,0.007,0.019
+  c0.008,0.01,0.009,0.005,0.02,0.011c0.018,0.01,0.024,0.026,0.038,0.04c0.028,0.03,0.071,0.05,0.105,0.068
+  c0.035,0.019,0.074,0.04,0.111,0.053c0.02,0.006,0.043,0.012,0.062,0.016c0.016,0.004,0.037,0.006,0.052,0.012
+  c0.021,0.009,0.039,0.025,0.059,0.034c0.018,0.009,0.029,0.022,0.046,0.032c0.018,0.01,0.04,0.019,0.059,0.026
+  c0.026,0.011,0.024,0.011,0.039,0.037c0.014,0.024,0.041,0.018,0.065,0.027c0.024,0.01,0.041,0.034,0.058,0.053
+  c0.022,0.026,0.06,0.041,0.094,0.052c0.018,0.006,0.036,0.008,0.053,0.015c0.019,0.007,0.037,0.02,0.052,0.033
+  c0.016,0.015,0.027,0.03,0.047,0.041c0.019,0.011,0.033,0.017,0.048,0.032c0.011,0.01,0.026,0.027,0.039,0.033
+  c0.016,0.006,0.037,0.009,0.054,0.014c0.022,0.006,0.045,0.001,0.067,0.006c0.008,0.002,0.019,0.007,0.028,0.009
+  c0.011,0.003,0.02,0.004,0.031,0.006c0.022,0.003,0.041,0.007,0.063,0.01c0.014,0.002,0.04,0.013,0.036,0.031
+  c-0.022-0.001-0.039,0.007-0.062,0.002c-0.019-0.004-0.036-0.005-0.057-0.008c-0.016-0.001-0.037-0.005-0.053-0.009
+  c-0.021-0.004-0.043-0.002-0.063-0.006c-0.019-0.005-0.034-0.016-0.053-0.02c-0.025-0.006-0.051-0.002-0.076-0.012
+  c-0.017-0.007-0.033-0.021-0.049-0.025c-0.018-0.004-0.04,0.002-0.058,0c-0.042-0.003-0.08-0.034-0.121-0.047
+  c-0.019-0.006-0.035-0.012-0.053-0.012c-0.02,0.001-0.037,0.004-0.053-0.008c-0.006-0.004-0.01-0.011-0.015-0.016
+  c-0.019-0.019-0.029-0.02-0.055-0.023c-0.019-0.002-0.045,0-0.064-0.005c-0.016-0.005-0.034-0.015-0.05-0.021
+  c-0.011-0.003-0.024-0.013-0.034-0.015c-0.008-0.002-0.019,0.004-0.026-0.001c-0.026-0.015-0.012-0.051-0.048-0.057
+  c-0.031-0.004-0.031-0.006-0.051-0.031c-0.025-0.03-0.056-0.057-0.091-0.074c-0.024-0.012-0.049-0.022-0.073-0.035
+  c-0.009-0.004-0.016-0.013-0.026-0.016c-0.011-0.002-0.022,0.002-0.032-0.002c-0.013-0.004-0.022-0.012-0.035-0.016
+  c-0.008-0.001-0.017-0.004-0.024-0.007c-0.01-0.005-0.014-0.01-0.025-0.012c-0.011-0.003-0.019-0.003-0.031-0.007
+  c-0.046-0.017-0.088-0.037-0.136-0.047c-0.032-0.006-0.06-0.024-0.09-0.034c-0.019-0.007-0.03-0.006-0.047-0.018
+  c-0.019-0.014-0.036-0.026-0.052-0.041c-0.017-0.017-0.039-0.023-0.058-0.037s-0.029-0.038-0.046-0.056
+  c-0.019-0.021-0.044-0.041-0.069-0.054c-0.029-0.016-0.058-0.041-0.089-0.051c-0.031-0.01-0.052-0.018-0.079-0.033
+  c-0.031-0.017-0.065-0.026-0.096-0.043c-0.013-0.008-0.027-0.013-0.04-0.021c-0.013-0.008-0.018-0.016-0.028-0.025
+  c-0.019-0.018-0.041-0.033-0.06-0.052c-0.019-0.019-0.043-0.015-0.065-0.031c-0.013-0.009-0.016-0.029-0.027-0.037
+  c-0.005-0.004-0.023-0.004-0.03-0.006c-0.02-0.006-0.035-0.01-0.041-0.031c-0.006-0.021-0.007-0.043-0.011-0.063
+  c-0.004-0.019,0-0.032,0.005-0.053c0.006-0.029,0.005-0.038-0.01-0.062c-0.012-0.021-0.01-0.029-0.038-0.032
+  c-0.028-0.003-0.03,0.016-0.053,0.025c-0.018,0.008-0.051,0.003-0.057-0.014c-0.004-0.012,0.005-0.023-0.003-0.033
+  c-0.006-0.008-0.019-0.011-0.027-0.016c-0.013-0.009-0.021-0.035-0.037-0.036c-0.002-0.013-0.002-0.021-0.005-0.03
+  c-0.021-0.006-0.049-0.03-0.066-0.043c-0.044-0.033-0.081-0.077-0.119-0.115c-0.017-0.017-0.032-0.033-0.048-0.052
+  c-0.012-0.015-0.028-0.02-0.042-0.032c-0.034-0.028-0.047-0.063-0.068-0.1c-0.012-0.021-0.04-0.029-0.05-0.051
+  c-0.001-0.002,0-0.004-0.001-0.007c-0.446-0.335-0.894-0.711-1.316-1.103c0.004,0.013,0.005,0.026,0.012,0.039
+  c0.005,0.008,0.01,0.012,0.014,0.021c0.007,0.017,0.009,0.036,0.016,0.053c0.018,0.046,0.042,0.088,0.053,0.136
+  c0.007,0.026,0.015,0.047,0.029,0.069c0.009,0.012,0.033,0.059,0.028,0.067l-0.011-0.005c-0.024-0.008-0.045-0.037-0.067-0.052
+  c-0.018-0.011-0.025-0.06-0.037-0.085c-0.013-0.027-0.034-0.048-0.05-0.074c-0.014-0.021-0.023-0.052-0.055-0.052
+  c0.003-0.024-0.014-0.031-0.027-0.047c-0.012-0.016-0.023-0.031-0.036-0.046c-0.027-0.029-0.05-0.068-0.065-0.104
+  c-0.004-0.01,0-0.02-0.003-0.032c-0.003-0.01-0.011-0.017-0.016-0.027c-0.007-0.014-0.009-0.032-0.017-0.047
+  c-0.006-0.011-0.021-0.019-0.026-0.031c-0.004-0.013-0.001-0.019-0.008-0.032c-0.002-0.003-0.004-0.006-0.006-0.008
+  c-1.279-1.251-2.211-2.634-1.778-3.512c0.001-0.001,0.002-0.001,0.004-0.002c-0.003-0.011-0.007-0.023-0.011-0.037
+  c-0.017-0.067,0.002-0.076,0.068-0.074c0.017,0.021,0.042,0.044,0.046,0.072c0.086-0.033,0.173-0.067,0.259-0.1
+  c-0.061-0.188-0.123-0.376-0.184-0.564c-0.002-0.002-0.005-0.002-0.009-0.006c0.002,0.002-0.034-0.046-0.033-0.041
+  c-0.001-0.001-0.002-0.002-0.003-0.002c0.006-0.01,0.011-0.023,0.018-0.035c-0.015-0.046-0.03-0.092-0.045-0.138
+  c-0.008-0.005-0.018-0.008-0.042-0.015c-0.043-0.01-0.053-0.017-0.072-0.058c-0.048-0.106-0.079-0.23-0.112-0.343
+  c0.001,0.002,0.002,0.003,0.005,0.002c0.008-0.042-0.03-0.102-0.042-0.14c-0.015-0.053-0.027-0.105-0.042-0.158
+  c-0.019-0.062-0.091-0.233-0.022-0.289c-0.041-0.125-0.082-0.25-0.123-0.375c0.346-0.283,0.692-0.566,1.038-0.85
+  c-0.001-0.001-0.002-0.002-0.003-0.003c-0.003-0.005-0.003-0.008-0.004-0.013c-0.001-0.003-0.003-0.004-0.003-0.008
+  c0-0.003,0-0.006,0-0.008c0-0.003-0.002-0.006-0.003-0.008c-0.001-0.006,0.003-0.011,0.003-0.016c0-0.007-0.001-0.008-0.003-0.013
+  c-0.003-0.009-0.009-0.015-0.013-0.023c-0.004-0.008-0.004-0.019-0.008-0.029c-0.003-0.006-0.006-0.011-0.011-0.016
+  c-0.005-0.006-0.007-0.014-0.011-0.019c0.003-0.004,0.01-0.003,0.011-0.008c0-0.007-0.017-0.004-0.021-0.004
+  c-0.018,0-0.034,0.005-0.052,0.004c-0.014-0.001-0.026-0.008-0.039-0.011c-0.016-0.004-0.03,0.009-0.045,0.011
+  c-0.006,0.001-0.013-0.002-0.02,0.001c-0.008,0.003-0.009,0.008-0.019,0.007c-0.014-0.001-0.023-0.008-0.036,0
+  c-0.006,0.003-0.011,0.008-0.017,0.012c-0.01,0.006-0.021,0.008-0.031,0.013c-0.017,0.007-0.035,0.009-0.052,0.014
+  c-0.034,0.008-0.062,0.022-0.093,0.037c-0.014,0.007-0.032,0.009-0.048,0.014c-0.016,0.006-0.031,0.016-0.047,0.023
+  c-0.012,0.005-0.026,0.012-0.039,0.015c-0.004,0-0.008,0-0.012-0.001c-0.005,0.001-0.007,0.002-0.012,0.003
+  c-0.007,0.002-0.014,0.005-0.02,0.006c-0.013,0.002-0.029-0.005-0.04,0.002c-0.006,0.004-0.008,0.01-0.016,0.013
+  c-0.007,0.001-0.017,0.002-0.023,0c0-0.007-0.005-0.008-0.008-0.012c-0.004-0.004-0.004-0.006-0.005-0.011
+  c-0.002-0.009-0.005-0.017-0.004-0.026c-0.001-0.007-0.002-0.015,0-0.022c0.002-0.016,0.015-0.028,0.023-0.041
+  c0.007-0.012,0.006-0.026,0.014-0.038c0.005-0.009,0.006-0.017,0.01-0.026c0.003-0.005,0.01-0.01,0.012-0.015
+  c0.002-0.004,0-0.008,0.002-0.011c0.006-0.012,0.019-0.021,0.027-0.033c0.004-0.007,0.005-0.016,0.008-0.024
+  c0.002-0.006,0.004-0.013,0.004-0.02v-0.02c0-0.003,0.001-0.009,0-0.012c-0.001-0.003-0.004-0.004-0.005-0.008
+  c-0.003-0.014,0.007-0.032-0.004-0.044c-0.006-0.005-0.012-0.005-0.018-0.008c-0.008-0.004-0.014-0.01-0.021-0.015
+  c-0.014-0.007-0.023-0.005-0.036,0.003c-0.006,0.003-0.01,0.007-0.012-0.003c-0.002-0.007,0-0.017,0-0.024
+  c0-0.009-0.005-0.013-0.004-0.021c0-0.005,0.006-0.01,0.009-0.014c0.006-0.01,0.012-0.02,0.023-0.026
+  c0.011-0.007,0.019-0.015,0.025-0.027c0.003-0.007,0.006-0.014,0.01-0.02c0.001-0.003,0.003-0.006,0.005-0.01
+  c0.001-0.002,0.001-0.005,0.002-0.008c0.001-0.006,0.004-0.01,0.006-0.016c0.001-0.003,0.002-0.004,0.003-0.007
+  c0.001-0.006,0-0.013,0.008-0.014l0,0c0.005-0.008,0.011-0.015,0.016-0.023c0.001-0.002,0.002-0.004,0.004-0.006
+  c0.003-0.006,0.006-0.009,0.01-0.013c0.005-0.006,0.009-0.012,0.013-0.018c0.004-0.007,0.005-0.016,0.009-0.023
+  c0.004-0.008,0.012-0.014,0.015-0.024c0.006-0.02-0.003-0.035-0.023-0.023c-0.016,0.009-0.031,0.021-0.048,0.03
+  c-0.025,0.012-0.013-0.02-0.004-0.03c0.013-0.015,0.03-0.023,0.042-0.039c0.012-0.014,0.015-0.035,0.029-0.047
+  c0.012-0.01,0.033-0.022,0.047-0.024c0.021-0.004,0.035-0.013,0.053-0.023c0.01-0.006,0.027-0.012,0.038-0.015
+  c0.006-0.001,0.01,0,0.015-0.001c0.005,0,0.007-0.003,0.01-0.003c0.011-0.002,0.014-0.002,0.023-0.007
+  c0.01-0.006,0.019-0.012,0.029-0.017c0.018-0.012,0.04-0.021,0.052-0.04c0.005-0.006,0.007-0.016,0.014-0.02
+  c0.007-0.005,0.016-0.006,0.023-0.009c0.018-0.009,0.024-0.022,0.035-0.037c0.003-0.005,0.01-0.016,0.015-0.019
+  c0.013-0.005,0.015,0.009,0.013,0.018c-0.003,0.009-0.013,0.02-0.018,0.029c-0.006,0.01-0.01,0.019-0.015,0.029
+  c-0.006,0.015-0.011,0.028-0.02,0.043c-0.006,0.009-0.01,0.019-0.017,0.029c-0.005,0.007-0.01,0.011-0.014,0.019
+  c-0.003,0.006-0.011,0.017-0.011,0.024c-0.001,0.01,0.007,0.012,0.004,0.022c-0.002,0.008-0.01,0.017-0.018,0.02
+  c-0.005,0.001-0.009,0-0.015,0.001c-0.004,0-0.007,0.003-0.01,0.003c-0.008,0.002-0.017-0.001-0.022,0.007
+  c-0.003,0.005,0.001,0.018,0.005,0.022c0.003,0.003,0.008,0.003,0.012,0.007c0.003,0.003,0.005,0.004,0.006,0.008
+  c0.001,0.004-0.001,0.01,0,0.015c0.001,0.006,0.001,0.005,0.003,0.01c0.004,0.008,0.009,0.014,0.013,0.022
+  c0.002,0.005,0.003,0.004,0.003,0.011c0,0.006-0.003,0.006-0.004,0.01c-0.001,0.006-0.001,0.012,0,0.018
+  c0.005,0.002,0.01,0.003,0.016,0.003c0.009,0.001,0.019-0.002,0.028,0c0.008,0.002,0.01,0.006,0.02,0.003
+  c0.008-0.002,0.015-0.002,0.024-0.003c0.003,0,0.009-0.003,0.012-0.003c0.004,0,0.003,0.003,0.007,0.003
+  c0.008,0.002,0.014,0.001,0.021,0.007c0.01,0.009,0.001,0.033-0.001,0.045c-0.005,0.018-0.001,0.035,0.007,0.052
+  c0.013,0.026,0.064-0.008,0.072-0.025c0.002-0.004,0.001-0.005,0.005-0.008c0.003-0.003,0.008-0.001,0.011-0.004
+  c0.007-0.005,0.011-0.015,0.009-0.023c-0.001-0.009-0.022-0.045-0.001-0.045c0.001-0.005,0.004-0.009,0.006-0.014
+  c0.003-0.005,0.003-0.01,0.004-0.016c0.001-0.005,0.007-0.023,0.014-0.024c0.004,0.007,0.014-0.001,0.017-0.004
+  c0.005-0.005,0.007-0.019,0.016-0.017c0.009,0.002,0.011,0.017,0.013,0.023c0.001,0.006,0.004,0.006,0.002,0.013
+  c-0.001,0.006-0.002,0.011-0.004,0.016c-0.003,0.012-0.003,0.023-0.003,0.036c0,0.011,0.001,0.02-0.003,0.029
+  c-0.008,0.017-0.007,0.035,0.003,0.051c0.009,0.014,0.024,0.027,0.037,0.039c0.008,0.007,0.016,0.005,0.026,0.005
+  c0.016,0,0.034,0,0.048-0.009c0.015-0.01,0.028-0.021,0.044-0.028c0.019-0.008,0.049-0.011,0.066-0.03
+  c0.008,0.003,0.009,0.003,0.018,0c0.009-0.003,0.016-0.005,0.023-0.01c0.006-0.003,0.011-0.01,0.017-0.011
+  c0.004-0.001,0.009,0.001,0.012,0c0.005-0.001,0.007-0.003,0.012-0.004c0.008-0.001,0.016,0.001,0.023-0.001
+  c0.009-0.002,0.019-0.006,0.029-0.007c0.007,0,0.015-0.001,0.02,0.004c0.008,0.007,0.001,0.014,0.004,0.024
+  c0.004,0.015,0.022,0.018,0.013,0.036c-0.011,0.021-0.032,0.027-0.049,0.044c-0.014,0.013-0.026,0.028-0.039,0.041
+  c-0.011,0.011-0.025,0.017-0.036,0.028c-0.008,0.007-0.02,0.016-0.025,0.026c-0.003,0.008-0.003,0.013-0.009,0.019
+  c-0.006,0.007-0.013,0.009-0.019,0.017c-0.007,0.012-0.017,0.02-0.027,0.029c-0.008,0.007-0.014,0.013-0.021,0.02
+  c-0.004,0.005-0.009,0.007-0.013,0.011c-0.002,0.004-0.004,0.009-0.006,0.012c-0.009,0.012-0.02,0.02-0.031,0.029
+  c-0.005,0.004-0.011,0.009-0.014,0.014c-0.005,0.006-0.007,0.014-0.011,0.021c-0.005,0.007-0.002,0.012-0.004,0.02
+  c-0.002,0.007-0.009,0.013-0.011,0.02c-0.005,0.015-0.001,0.036-0.001,0.052c0,0.008-0.003,0.012-0.004,0.02
+  c-0.002,0.006,0.001,0.013,0,0.02c-0.001,0.006-0.003,0.009-0.004,0.015c-0.001,0.007,0,0.014,0,0.021
+  c-0.001,0.012-0.006,0.027-0.009,0.039c-0.001,0.005-0.001,0.009-0.002,0.013c0.08-0.066,0.159-0.131,0.239-0.196
+  c0.048,0.003,0.096,0.005,0.144,0.008c0.001-0.004,0-0.007,0.002-0.01c0.002-0.004,0.005-0.01,0.009-0.013
+  c0.004-0.004,0.01-0.003,0.014-0.009c0.008-0.011,0.004-0.027,0.005-0.04c0-0.018,0.014-0.018,0.028-0.025
+  c0.011-0.006,0.02-0.012,0.031-0.02c0.012-0.008,0.024-0.003,0.036-0.012c0.006-0.004,0.011-0.009,0.017-0.014
+  c0.005-0.004,0.008-0.004,0.015-0.006c0.009-0.002,0.009-0.003,0.016,0.001c0.006,0.004,0.008,0.004,0.007,0.011
+  c0,0.003-0.005,0.008-0.006,0.01c-0.002,0.006-0.005,0.013-0.005,0.019c0,0.012,0.003,0.027-0.003,0.037
+  c-0.006,0.011-0.021,0.016-0.029,0.026c-0.007,0.008-0.01,0.018-0.019,0.026c-0.002,0.002-0.006,0.005-0.008,0.008
+  c-0.002,0.003-0.002,0.011-0.005,0.014c-0.001,0.001-0.003,0.001-0.005,0.002c0.022,0.001,0.043,0.002,0.064,0.003
+  c0.002-0.006,0.006-0.013,0.008-0.018c0.008-0.024,0.023-0.032,0.045-0.045c0.022-0.012,0.043-0.01,0.067-0.021
+  c0.013-0.006,0.024-0.014,0.037-0.019c0.016-0.007,0.039-0.005,0.054-0.011c0.048-0.02,0.066-0.083,0.096-0.12
+  c0.018-0.021,0.03-0.027,0.055-0.019c0.012,0.004,0.021,0.013,0.032,0.016c0.021,0.007,0.044,0.005,0.064,0.011
+  c0.026,0.009,0.043,0.024,0.059,0.046c0.009,0.012,0.013,0.026,0.021,0.038c0.006,0.009,0.02,0.018,0.025,0.026
+  c0.01,0.017,0.007,0.045,0.005,0.066c-0.005,0.043,0.01,0.019,0.035,0.044c0.015,0.014,0.004,0.026-0.002,0.038
+  c0.293,0.016,0.586,0.031,0.879,0.047c0-0.008-0.001-0.017,0.001-0.024c0.004-0.014,0.016-0.024,0.019-0.037
+  c-0.001,0.006,0.001,0.011,0.001,0.016c0.02-0.01,0.041-0.019,0.062-0.026c0.02-0.008,0.043-0.037,0.059-0.037
+  c0.012,0,0.047,0.023,0.06,0.03c0.035,0.017,0.058,0.028,0.098,0.028l0,0c0.32-0.095,0.639-0.19,0.958-0.285
+  c0.003-0.004,0.006-0.008,0.01-0.012c0.019-0.019,0.042-0.016,0.061-0.031c0.016-0.013,0.016-0.038,0.023-0.056
+  c0.016-0.04,0.063-0.047,0.1-0.04c0.003,0.006,0.007,0.008,0.013,0.009c0.006-0.001,0.011-0.004,0.013-0.009
+  c0.01-0.003,0.014-0.004,0.022-0.01c0.009-0.007,0.027-0.023,0.029-0.034c0.005-0.022-0.051-0.075-0.003-0.083
+  c0.018,0.021,0.04,0.04,0.055,0.062c0.016,0.021,0.032,0.044,0.05,0.065c0.005,0.006,0.01,0.015,0.017,0.024
+  c0.129-0.039,0.258-0.077,0.387-0.116c0.024,0.045,0.047,0.09,0.07,0.135c-0.204,0.679-0.937,1.674-0.611,2.037
+  c0.325,0.363,0.981,0.295,1.472,0.442c0.069,0.151,0.138,0.302,0.207,0.454c-0.111,0.243-0.223,0.487-0.334,0.73
+  c0.051,0.247,0.101,0.495,0.152,0.742c0.02,0.015,0.036,0.036,0.042,0.045c0.021,0.033,0.016,0.069,0.028,0.103
+  c0.007,0.016,0.016,0.033,0.02,0.049c0.003,0.016-0.008,0.032-0.008,0.046c-0.001,0.012,0.019,0.024,0.027,0.035
+  c0.012,0.015,0.016,0.03,0.019,0.045c0.009,0.037,0.011,0.074,0,0.111c-0.006,0.022,0.009,0.04,0.008,0.062
+  c0,0.02-0.001,0.04,0,0.059c0.001,0.01,0.007,0.019,0.006,0.028c-0.001,0.009-0.011,0.018-0.018,0.027
+  c0.045,0.223,0.091,0.445,0.136,0.668c0.483,0.384,0.967,0.768,1.45,1.152c-0.011,0.005-0.021,0.011-0.032,0.016
+  c0.032,0.006,0.083,0.008,0.097,0.036c-0.026,0.011-0.052,0.025-0.078,0.032c-0.021,0.005-0.039,0.021-0.059,0.025
+  c-0.022,0.006-0.046,0.005-0.067,0.013c-0.002,0.001-0.004,0.002-0.006,0.003c0.041,0.054,0.082,0.109,0.124,0.164
+  c0.047-0.014,0.094-0.027,0.141-0.04c-0.014-0.016-0.025-0.039-0.028-0.05c-0.002-0.012-0.006-0.038,0-0.049
+  c0.007-0.012,0.024-0.012,0.033-0.024c0.02-0.028-0.005-0.064,0.023-0.084c0.028-0.02,0.058,0.011,0.085,0.021
+  c0.031,0.012,0.067,0.008,0.065,0.05c-0.003,0.038-0.052,0.063-0.079,0.084c-0.008,0.006-0.024,0.015-0.027,0.025
+  c-0.001,0.002,0.001,0.004,0.001,0.006C-25.854,56.564-25.78,56.543-25.706,56.522z M-29.093,49.403
+  c-0.006,0.016-0.011,0.036-0.032,0.033c-0.008-0.002-0.017-0.013-0.026-0.025l0.016,0.024c-0.018,0.002-0.027-0.025-0.031-0.046
+  l0.005,0.008c-0.001-0.003-0.003-0.006-0.005-0.008c-0.001-0.007-0.001-0.013-0.001-0.018c0-0.021,0.011-0.037,0.018-0.055
+  c0.006-0.015,0.008-0.046,0.024-0.051c0.019-0.006,0.034,0.02,0.043,0.032c0.016,0.026,0.002,0.027-0.001,0.053
+  C-29.085,49.369-29.086,49.386-29.093,49.403z M-29.177,49.371c0.003,0.004,0.007,0.01,0.011,0.018l0,0L-29.177,49.371z
+  M-30.756,48.278c-0.003,0.006-0.009,0.011-0.011,0.018c0,0.002-0.001,0.005-0.001,0.007c-0.002,0.002-0.004,0.005-0.006,0.007
+  c-0.002,0.006-0.002,0.012-0.005,0.018c-0.004,0.01-0.003,0.021-0.006,0.031c-0.006,0.016-0.011,0.032-0.019,0.047
+  c-0.008,0.019-0.025,0.034-0.038,0.051c-0.009,0.011-0.017,0.022-0.026,0.033c-0.006,0.008-0.012,0.016-0.017,0.024
+  c-0.01,0.017-0.014,0.037-0.026,0.053c-0.007,0.01-0.017,0.019-0.024,0.029c-0.009,0.012-0.016,0.023-0.025,0.034
+  c-0.006,0.006-0.01,0.014-0.017,0.02c-0.006,0.006-0.014,0.011-0.019,0.018c-0.007,0.011-0.016,0.019-0.029,0.022
+  c-0.01,0.001-0.022-0.003-0.032,0c-0.004,0.001-0.007,0.006-0.01,0.008c-0.006,0.003-0.009,0.002-0.016,0.002l-0.01-0.007
+  c-0.003-0.003-0.007-0.004-0.011-0.006c-0.008-0.007-0.012-0.018-0.018-0.026c-0.006-0.007-0.007-0.014-0.012-0.021
+  c-0.004-0.006-0.009-0.009-0.013-0.016c-0.004-0.006-0.009-0.012-0.015-0.018c-0.006-0.005-0.012-0.008-0.017-0.013
+  c-0.006-0.005-0.008-0.015-0.01-0.022c-0.002-0.007-0.005-0.013-0.005-0.021c0.001-0.008-0.003-0.014-0.003-0.022
+  c-0.001-0.008,0.001-0.017,0-0.025c-0.003-0.032-0.026-0.059-0.033-0.089c-0.004-0.014-0.005-0.027,0.008-0.037
+  c0.005-0.004,0.012-0.006,0.018-0.009c0.008-0.005,0.017-0.01,0.025-0.015c0.006-0.003,0.012-0.008,0.018-0.012
+  c0.007-0.006,0.011-0.014,0.018-0.02c0.005-0.004,0.01-0.006,0.014-0.011c0.004-0.004,0.005-0.009,0.009-0.013
+  c0.008-0.011,0.022-0.021,0.033-0.029c0.01-0.008,0.018-0.016,0.029-0.022c0.013-0.008,0.023-0.02,0.036-0.029
+  c0.008-0.006,0.014-0.012,0.022-0.018c0.007-0.004,0.013-0.007,0.02-0.011c0.012-0.008,0.026-0.011,0.038-0.017
+  c0.005-0.002,0.01-0.003,0.014-0.007c0.008-0.005,0.017-0.009,0.024-0.015c0.005-0.004,0.01-0.008,0.014-0.01
+  c0.007-0.005,0.014-0.01,0.022-0.014c0.006-0.003,0.011-0.005,0.018-0.004c0.009,0.003,0.016,0.006,0.024,0.009
+  c0.011,0.005,0.02,0.009,0.03,0.015c0.004,0.002,0.007,0.005,0.011,0.007c0.008,0.004,0.008,0.004,0.01,0.012
+  c0.005,0.013,0.002,0.026,0.01,0.039c0.006,0.01,0.026,0.011,0.03,0.021c0.003,0.01-0.003,0.024-0.008,0.032
+  S-30.752,48.27-30.756,48.278z M-30.84,48.052c0,0-0.007,0.007-0.007,0.008c-0.004,0.004-0.006,0.005-0.01,0.008
+  c-0.008,0.005-0.014,0.014-0.022,0.019c-0.01,0.008-0.023,0.016-0.035,0.019c-0.012,0.003-0.023,0.006-0.033,0.014
+  c-0.011,0.007-0.021,0.016-0.032,0.023c-0.003,0.002-0.015,0.009-0.019,0.009c-0.006,0.001-0.014-0.005-0.02-0.01l0.002-0.003
+  c-0.004-0.005-0.005-0.009-0.007-0.015c-0.002-0.007,0-0.014-0.002-0.022c-0.001-0.005-0.006-0.007-0.004-0.014
+  c0.001-0.006,0.006-0.01,0.01-0.014c0.006-0.006,0.01-0.018,0.014-0.026c0.008-0.016,0.019-0.02,0.033-0.029
+  c0.008-0.004,0.011-0.002,0.018,0.001c0.009,0.002,0.011-0.002,0.017-0.008c0.009-0.008,0.019-0.015,0.029-0.024
+  c0.012-0.01,0.022-0.022,0.037-0.029c0.004-0.002,0.009-0.005,0.014-0.007c0.004-0.002,0.012-0.004,0.017-0.002
+  c0.027,0.01,0,0.046,0.001,0.063C-30.839,48.024-30.836,48.042-30.84,48.052z M-31.022,48.138c0.001,0.001,0.003,0.003,0.004,0.004
+  l0,0L-31.022,48.138z M-31.215,48.707c0.002,0.008,0.007,0.015,0.011,0.022c0.005,0.007,0.008,0.014,0.01,0.021
+  c0.003,0.007,0.006,0.014,0.003,0.022c-0.004,0.011-0.009,0.008-0.017,0.01c-0.013,0.003-0.024,0.015-0.035,0.021
+  c-0.006,0.003-0.013,0.005-0.019,0.008c-0.004,0.003-0.008,0.005-0.013,0.007c-0.005,0.002-0.01,0.006-0.015,0.007
+  c-0.005,0.001-0.009,0-0.014,0c-0.009,0.002-0.018,0.004-0.027,0.007c-0.023,0.006-0.046,0.007-0.07,0.013
+  c-0.015,0.004-0.03,0.005-0.046,0.008c-0.013,0.003-0.024,0.007-0.036,0.011c-0.038,0.011-0.072,0.036-0.104,0.057
+  c-0.018,0.012-0.034,0.018-0.054,0.013c-0.01-0.003-0.02,0.001-0.029,0.006c-0.014,0.007-0.025,0.015-0.04,0.021
+  c-0.012,0.004-0.029,0.007-0.042,0.008c-0.006,0-0.012-0.001-0.018-0.001c-0.01,0.001-0.02,0.004-0.029,0.004
+  c-0.009,0.001-0.016-0.001-0.024,0.001c-0.008,0.001-0.014,0.003-0.022,0.003c-0.017,0-0.033,0.002-0.05,0.003
+  c-0.007,0-0.012,0.003-0.018,0.004c-0.009,0.001-0.019,0-0.028,0c-0.01,0-0.017,0.001-0.026,0.003c-0.01,0.001-0.019-0.001-0.028,0
+  c-0.007,0.001-0.014,0.004-0.021,0.004c-0.011,0.001-0.022,0-0.033,0c-0.02,0-0.04,0-0.061,0c-0.023,0-0.053-0.005-0.071-0.021
+  c-0.009-0.009-0.017-0.016-0.025-0.025c-0.004-0.003-0.007-0.007-0.011-0.011c-0.005-0.002-0.012-0.003-0.017-0.005
+  c-0.006-0.002-0.013-0.006-0.018-0.01c-0.01-0.008-0.01-0.018-0.015-0.028c-0.003-0.007-0.007-0.015-0.011-0.022
+  c-0.006-0.01-0.002-0.019,0.001-0.031c0.001-0.004,0.002-0.008,0.004-0.012c-0.004-0.014-0.005-0.028-0.008-0.042
+  c-0.002-0.015,0.011-0.033,0.017-0.047c0.002-0.007,0.006-0.014,0.004-0.022c-0.004-0.009-0.01-0.017-0.011-0.027
+  c-0.001-0.013-0.006-0.024,0.001-0.037c0.002-0.005,0.004-0.009,0.008-0.013c0.005-0.006,0.012-0.01,0.017-0.016
+  c0.005-0.006,0.008-0.009,0.018-0.007c0.003,0.001,0.003,0.003,0.006,0.004c0.004,0.001,0.007,0,0.011,0.001
+  c0.008,0.002,0.013,0.004,0.022,0.002c0.003-0.001,0.007-0.003,0.011-0.004c0.005-0.002,0.008-0.001,0.014-0.002
+  c0.004-0.001,0.006-0.004,0.011-0.004c0.003,0.001,0.007,0.003,0.01,0.003c0.004,0.001,0.008,0,0.011,0
+  c0.004,0.001,0.006,0.003,0.008,0.003c0.007,0.002,0.014,0.001,0.021,0.001c0.009,0,0.016,0.006,0.025,0.007
+  c0.003,0.001,0.007-0.001,0.011,0c0.003,0.001,0.003,0.003,0.006,0.004c0.007,0.001,0.016,0,0.022,0c0.017,0,0.03,0.001,0.042-0.012
+  c0.009-0.009,0.012-0.023,0.022-0.032c0.003-0.004,0.008-0.007,0.011-0.011c0.006-0.006,0.011-0.007,0.018-0.011
+  c0.015-0.007,0.022-0.023,0.03-0.037c0.007-0.013,0.017-0.024,0.024-0.038c0.005-0.012,0.009-0.026,0.014-0.038
+  c0.002-0.006,0.009-0.013,0.01-0.019c0.001-0.003,0-0.007,0.001-0.01c0-0.003,0.003-0.004,0.004-0.007
+  c0-0.005-0.002-0.007-0.003-0.011c-0.002-0.006-0.002-0.012-0.004-0.018c-0.006-0.023-0.004-0.043,0.003-0.064
+  c0.005-0.016,0.011-0.03,0.011-0.047c-0.001-0.016,0-0.035,0.021-0.035c0.017,0,0.021,0.014,0.033,0.024
+  c0.012,0.009,0.027,0.002,0.038-0.003c0.014-0.006,0.027-0.017,0.037-0.028c0.006-0.007,0.014-0.015,0.017-0.023
+  c0.007-0.013,0.012-0.028,0.018-0.042c0.009-0.018,0.018-0.037,0.029-0.054c0.005-0.009,0.011-0.015,0.013-0.024
+  c0.002-0.01-0.002-0.015-0.007-0.022c-0.007-0.012-0.009-0.029-0.006-0.043c0.001-0.008,0.003-0.013,0.003-0.022
+  c0-0.007,0-0.014,0-0.021c0.001-0.02,0.007-0.042,0.014-0.061c0.007-0.019,0.005-0.04,0.009-0.06
+  c0.003-0.019,0.013-0.039,0.013-0.058c0-0.013,0.003-0.03-0.001-0.043c-0.001-0.006-0.005-0.012-0.006-0.018
+  c-0.002-0.007-0.002-0.014-0.003-0.021c-0.001-0.004-0.004-0.004-0.004-0.007c-0.001-0.003,0-0.008,0-0.011
+  c0-0.007-0.001-0.015,0.001-0.021c0.004-0.016,0.005-0.03,0.014-0.043c0.008-0.012,0.019-0.019,0.025-0.032
+  c0.004-0.008,0.02-0.028,0.031-0.026c0.005,0.001,0.011,0.008,0.014,0.012c0.006,0.008,0.004,0.012,0.001,0.02
+  c-0.004,0.017,0.001,0.031,0.01,0.044c0.008,0.014,0.011,0.027,0.016,0.042c0.005,0.017,0.015,0.016,0.028,0.021
+  c0.018,0.007,0.022,0.024,0.028,0.04c0.002,0.006,0.006,0.013,0.007,0.018c0.001,0.003-0.001,0.008,0,0.011
+  c0.001,0.003,0.003,0.008,0.004,0.01c0.004,0.013,0.003,0.026,0.003,0.04c0,0.006,0.002,0.015,0,0.022
+  c-0.001,0.004-0.008,0.016-0.003,0.02c0.01,0.009,0.018-0.03,0.033-0.014c0.009,0.01,0.012,0.031,0.009,0.043
+  c-0.001,0.005-0.003,0.007-0.003,0.011c0,0.004,0.001,0.008,0,0.011c-0.001,0.005-0.005,0.013-0.007,0.018
+  c-0.003,0.006-0.007,0.009-0.011,0.014c-0.003,0.006-0.006,0.012-0.007,0.018c-0.001,0.008,0.001,0.015-0.002,0.022
+  c-0.006,0.014-0.015,0.012-0.026,0.018c-0.008,0.005-0.01,0.012-0.011,0.021c-0.001,0.005-0.001,0.01,0.001,0.014
+  c0.001,0.006,0.001,0.013,0.003,0.018c0.005,0.016,0.017,0.029,0.023,0.043c0.004,0.007,0.008,0.014,0.016,0.017
+  c0.009,0.004,0.016-0.001,0.021-0.006c0.01-0.011,0.017-0.029,0.022-0.043c0.007-0.016,0-0.034,0.017-0.044
+  c0.014-0.007,0.018,0.01,0.025,0.019c0.004,0.005,0.012,0.009,0.018,0.011c0.009,0.001,0.018-0.006,0.025-0.003
+  c0.004,0.001,0.007,0.008,0.01,0.011c0.005,0.003,0.01,0.004,0.015,0.007c0.007,0.005,0.014,0.012,0.019,0.019
+  c0.009,0.012,0.01,0.02,0.01,0.034v0.06c0,0.019,0.003,0.04-0.004,0.058c-0.002,0.007-0.003,0.013-0.003,0.021
+  s-0.003,0.014-0.004,0.021c0,0.004,0.001,0.008,0.001,0.011c-0.001,0.004-0.004,0.007-0.005,0.011c0,0.005,0.001,0.01,0,0.015
+  c-0.001,0.008-0.004,0.017-0.007,0.025c-0.006,0.013-0.012,0.027-0.014,0.042c0,0.008-0.003,0.014-0.004,0.022
+  c-0.003,0.017-0.003,0.03,0,0.048c0.002,0.01,0,0.02,0.001,0.03c0,0.008,0.003,0.016,0.004,0.024c0.002,0.01,0.003,0.02,0.005,0.03
+  c0.003,0.01,0.008,0.019,0.011,0.029c0.005,0.014,0.006,0.029,0.013,0.042c0.002,0.004,0.005,0.011,0.007,0.014
+  c0.004,0.006,0.007,0.007,0.012,0.011c0.009,0.008,0.019,0.022,0.024,0.033C-31.218,48.693-31.217,48.7-31.215,48.707z
+  M-31.576,47.405c-0.012,0.017-0.033,0.042-0.054,0.043c-0.01,0-0.018,0.003-0.029,0.003c-0.009,0.001-0.025-0.005-0.025-0.017
+  l0.011,0.001c-0.008-0.003-0.017-0.012-0.022-0.017c-0.018-0.015-0.019-0.026-0.015-0.048c0.003-0.013,0.006-0.027,0.015-0.037
+  c0.008-0.007,0.016-0.011,0.022-0.021c0.005-0.007,0.005-0.023,0.014-0.025c0.01-0.003,0.02-0.001,0.028-0.008
+  c0.007-0.005,0.009-0.012,0.019-0.01c0.01,0.002,0.018,0.01,0.028,0.011c0.012,0,0.014-0.001,0.019,0.011
+  c0.004,0.009,0.008,0.022,0.007,0.032c-0.002,0.016-0.006,0.031-0.008,0.046C-31.567,47.381-31.57,47.395-31.576,47.405z
+  M-32.403,49.724C-32.403,49.723-32.403,49.723-32.403,49.724L-32.403,49.724L-32.403,49.724z M-32.319,48.806
+  c-0.002,0.006,0,0.006-0.004,0.012c-0.002,0.003-0.005,0.006-0.007,0.009c-0.004,0.006-0.006,0.013-0.008,0.019
+  c-0.003,0.007-0.003,0.013-0.006,0.02c0,0.001-0.007,0.011-0.008,0.011c-0.005,0.003-0.01-0.002-0.015-0.003l-0.008-0.004
+  c-0.004-0.014-0.016-0.027-0.021-0.04c-0.003-0.008-0.005-0.014-0.011-0.021c-0.002-0.002-0.005-0.007-0.007-0.008
+  c-0.003-0.002-0.007-0.001-0.009-0.003c-0.006-0.003-0.01-0.011-0.015-0.017c-0.006-0.008-0.004-0.009-0.002-0.019
+  c0.003-0.011-0.005-0.009-0.01-0.016c-0.004-0.007,0.001-0.017,0.003-0.024c0.005-0.013,0.006-0.029,0.012-0.044
+  c0.005-0.012,0.012-0.025,0.019-0.036c0.006-0.009,0.002-0.015,0.005-0.024c0.002-0.006,0.009-0.008,0.011-0.015
+  c0.002-0.007,0.005-0.018,0.004-0.024c-0.001-0.009-0.008-0.021,0.005-0.024c0.007-0.003,0.014,0,0.019,0.005
+  c0.006,0.006,0.004,0.01,0.006,0.019c0.003,0.015,0.012,0.028,0.016,0.043c0.001,0.004,0.002,0.004,0.003,0.009
+  c0,0.007,0.002,0.01,0.003,0.016c0.002,0.008,0.003,0.015,0.006,0.024c0.002,0.008,0.006,0.012,0.011,0.019
+  c0.005,0.008,0.007,0.017,0.011,0.025c0.006,0.014,0.009,0.028,0.009,0.043c0,0.01,0.001,0.019-0.003,0.028
+  C-32.313,48.793-32.317,48.8-32.319,48.806z M-32.951,49.238c-0.004,0.004-0.007,0.009-0.011,0.013
+  c-0.005,0.007-0.015,0.019-0.017,0.027s0.001,0.009-0.005,0.015c-0.003,0.004-0.006,0.007-0.01,0.01
+  c-0.011,0.011-0.017,0.014-0.017,0.031c0,0.014-0.003,0.026-0.01,0.037c-0.004,0.005-0.011,0.011-0.018,0.011
+  c-0.008,0.001-0.011-0.006-0.015-0.012c0.008-0.018-0.01-0.041-0.02-0.056c-0.011-0.018-0.03-0.034-0.033-0.056
+  c-0.001-0.014,0.009-0.022,0.015-0.033c0.008-0.012,0.016-0.023,0.025-0.035c0.007-0.01,0.014-0.02,0.024-0.028
+  c0.004-0.002,0.009-0.004,0.012-0.008c0.002-0.005,0.001-0.014,0.005-0.019c0.002,0,0.004-0.001,0.006-0.001
+  c0.003-0.002,0.004-0.005,0.006-0.007c0.007-0.005,0.01-0.005,0.019-0.005c0.012,0.001,0.031-0.004,0.039,0.005
+  c0.009,0.01,0.013,0.018,0.013,0.031c0,0.007,0,0.014,0,0.02c0,0.01,0.005,0.015,0.009,0.023c0.003,0.007,0.003,0.01-0.001,0.018
+  C-32.939,49.226-32.945,49.232-32.951,49.238z M-33.22,48.753c-0.008,0.025-0.021,0.047-0.041,0.062
+  c-0.017,0.014-0.035,0.032-0.048,0.05c-0.013,0.02-0.032,0.039-0.042,0.061c-0.004,0.007-0.007,0.013-0.01,0.02
+  c-0.002,0.004-0.005,0.008-0.007,0.012c-0.003,0.003-0.003,0.007-0.005,0.011c-0.008,0.013-0.022,0.025-0.031,0.037
+  c-0.005,0.006-0.009,0.013-0.013,0.02c-0.003,0.004-0.008,0.007-0.011,0.011c-0.006,0.008-0.006,0.014-0.013,0.022
+  c-0.008,0.009-0.018,0.015-0.027,0.023c-0.007,0.007-0.012,0.014-0.019,0.021c-0.005,0.004-0.013,0.01-0.02,0.005
+  c-0.007-0.004-0.004-0.011-0.006-0.018c-0.001,0-0.002,0-0.003-0.001l-0.004-0.004c0-0.009,0.003-0.015,0.004-0.023
+  c0.001-0.005,0-0.011,0-0.015c0-0.007,0.002-0.011,0.003-0.016c0.004-0.02,0.008-0.039,0.014-0.057
+  c0.005-0.016,0.005-0.032,0.011-0.048c0.003-0.008,0.004-0.017,0.009-0.023c0.007-0.008,0.012-0.01,0.016-0.02
+  c0.001-0.004,0.002-0.004,0.003-0.009c0-0.004-0.001-0.007,0.001-0.011c0.002-0.004,0.008-0.008,0.012-0.012
+  c0.007-0.008,0.011-0.019,0.015-0.029c0.003-0.009,0.008-0.012,0.013-0.02c0.005-0.007,0.007-0.016,0.01-0.025
+  c0.004-0.012,0.008-0.013,0.016-0.023c0.009-0.012,0.012-0.027,0.021-0.04c0.009-0.012,0.017-0.022,0.025-0.035
+  c0.005-0.009,0.008-0.016,0.015-0.024c0.005-0.008,0.007-0.017,0.012-0.024c0.006-0.008,0.013-0.013,0.021-0.019
+  c0.001-0.002,0.003-0.005,0.005-0.006c0.003-0.002,0.006-0.002,0.008-0.004c0.01-0.007,0.013-0.029,0.029-0.023
+  c0.013,0.004,0.016,0.023,0.019,0.033c0.003,0.007,0.005,0.013,0.01,0.018c0.003,0.004,0.007,0.006,0.01,0.01
+  c0.005,0.004,0.003,0.005,0.005,0.011c0.005,0.014,0.017,0.031,0.019,0.047c0.002,0.012-0.004,0.014-0.011,0.022
+  C-33.213,48.73-33.216,48.742-33.22,48.753z M-33.383,48.53c-0.013,0.006-0.025,0.013-0.038,0.017
+  c-0.014,0.005-0.02,0.014-0.029,0.024c-0.008,0.008-0.016,0.012-0.026,0.016c-0.007,0.003-0.01,0.004-0.017-0.001
+  c-0.005-0.002-0.011-0.006-0.012-0.011l-0.008-0.009c-0.008-0.007-0.014-0.015-0.02-0.024c-0.003-0.004-0.01-0.011-0.011-0.016
+  c-0.004-0.011-0.001-0.028,0.002-0.039c0.003-0.009,0.001-0.021,0.009-0.027c0.004-0.004,0.01-0.005,0.015-0.01
+  c0.003-0.004,0.005-0.008,0.008-0.012c0.002-0.004,0.007-0.007,0.01-0.01c0.005-0.006,0.008-0.012,0.015-0.016
+  c0.006-0.005,0.008-0.004,0.016-0.005c0.007-0.001,0.012-0.004,0.02-0.004s0.012,0.003,0.02,0.004
+  c0.012,0.002,0.025-0.003,0.036,0.003c0.006,0.003,0.014,0.008,0.019,0.013s0.006,0.013,0.012,0.017
+  c0.007,0.004,0.014,0,0.019,0.004c0.004,0.002,0.006,0.008,0.008,0.012c0.007,0.013,0.012,0.016,0.005,0.031
+  c-0.006,0.013-0.011,0.017-0.023,0.024C-33.364,48.516-33.372,48.525-33.383,48.53z M-33.559,49.088
+  c-0.003,0.01-0.003,0.011-0.01,0.017c-0.006,0.006-0.017,0.007-0.021,0.015c-0.003,0.005,0,0.013-0.001,0.021
+  c-0.001,0.013,0.004,0.016-0.01,0.02l-0.005-0.007c-0.014,0.002-0.02-0.026-0.017-0.036c0.004-0.01,0.006-0.017,0.007-0.027
+  c0-0.009-0.002-0.017,0-0.025c0.002-0.015,0.003-0.029,0.011-0.042c0.003-0.006,0.008-0.011,0.013-0.016
+  c0.009-0.01,0.013-0.012,0.025-0.005c0.007,0.003,0.011,0.005,0.014,0.012c0.004,0.008,0.006,0.018,0.005,0.028
+  c-0.001,0.007,0.001,0.014,0,0.021C-33.55,49.072-33.557,49.079-33.559,49.088z M-33.537,48.952
+  c-0.006,0.009-0.019,0.019-0.031,0.016l0.004-0.008c-0.003,0-0.009,0.002-0.012,0.001c-0.006-0.002-0.005-0.007-0.009-0.012
+  c-0.006-0.008-0.011-0.012-0.011-0.024c-0.001-0.009,0.003-0.016,0.004-0.025c0.003-0.02,0-0.043,0-0.063
+  c0-0.012,0.002-0.018,0.005-0.029c0.003-0.012,0.002-0.021,0.011-0.03c0.006-0.006,0.013-0.01,0.015-0.018
+  c0.001-0.005,0-0.01,0.001-0.015c0.001-0.006,0.004-0.01,0.005-0.015c0.008-0.001,0.023-0.005,0.03-0.01
+  c0.01-0.007,0.011-0.016,0.014-0.026c0.002-0.008,0.01-0.013,0.016-0.02c0.008-0.009,0.007-0.022,0.014-0.033
+  c0.012-0.021,0.045-0.029,0.058-0.005c0.006,0.012,0.001,0.021-0.002,0.033c-0.001,0.005,0.001,0.012,0.001,0.017
+  c-0.001,0.012-0.007,0.022-0.009,0.034c0,0.007,0,0.014-0.004,0.021c-0.004,0.006-0.01,0.011-0.014,0.017
+  c-0.007,0.009-0.016,0.017-0.02,0.028c-0.01,0.025-0.031,0.045-0.04,0.071c-0.005,0.011-0.007,0.023-0.01,0.035
+  c-0.001,0.004-0.003,0.006-0.003,0.013s-0.003,0.009-0.004,0.015c-0.002,0.005,0.001,0.011,0,0.017S-33.534,48.947-33.537,48.952z
+  M-33.541,48.343c-0.002,0.008-0.003,0.013-0.003,0.021c0,0.01,0,0.011-0.005,0.019c-0.007,0.012-0.019,0.023-0.023,0.036
+  c-0.002,0.007-0.003,0.013-0.007,0.02c-0.003,0.006-0.009,0.014-0.009,0.02s0.003,0.01,0.004,0.016
+  c0.001,0.007-0.002,0.012-0.003,0.017c-0.002,0.012-0.002,0.025-0.009,0.035c-0.002,0.004-0.005,0.008-0.009,0.011
+  c-0.003,0.002-0.014,0.007-0.018,0.008c0-0.006-0.006-0.009-0.005-0.015l-0.008-0.004c0-0.008,0.001-0.016,0.001-0.023
+  c-0.001-0.013-0.008-0.025-0.009-0.037c0-0.005,0.002-0.011,0.001-0.016c-0.001-0.004-0.004-0.008-0.005-0.012
+  c-0.001-0.006,0-0.006-0.003-0.012c-0.003-0.004-0.008-0.009-0.012-0.013c-0.008-0.01-0.015-0.022-0.025-0.03
+  c-0.007-0.004-0.017-0.005-0.023-0.009c-0.005-0.005-0.012-0.016-0.013-0.024c0-0.008,0.005-0.015,0.005-0.024
+  c-0.001-0.008,0.002-0.016,0.003-0.024c0.004-0.016,0.011-0.034,0.017-0.051c0.003-0.005,0.005-0.015,0.008-0.02
+  c0.004-0.005,0.009-0.009,0.012-0.016c0.003-0.009,0.007-0.019,0.008-0.028c0-0.009-0.002-0.019,0-0.028
+  c0.007,0,0.01-0.003,0.015-0.004c0.006-0.002,0.014,0.001,0.02,0c0.013-0.002,0.021-0.011,0.031-0.017c0.009-0.006,0.011,0,0.02,0
+  c0.008,0,0.013-0.003,0.021-0.003c0.014,0,0.027,0.001,0.04,0.007c0.01,0.005,0.02,0.014,0.029,0.02
+  c0.007,0.005,0.012,0.016,0.016,0.024c0.005,0.011,0.009,0.018,0.006,0.032c-0.004,0.022-0.019,0.029-0.031,0.045
+  C-33.523,48.289-33.533,48.314-33.541,48.343z M-32.86,55.655c0.007,0.016,0.017,0.03,0.024,0.047
+  c0.017,0.042,0.038,0.08,0.055,0.121c0.017,0.04,0.045,0.07,0.072,0.105c0.02,0.024,0.06,0.071,0.052,0.104
+  c-0.017-0.006-0.026-0.023-0.041-0.031l-0.006,0.005c-0.033-0.027-0.062-0.063-0.067-0.105c-0.005-0.03-0.024-0.065-0.039-0.094
+  c-0.009-0.018-0.031-0.033-0.035-0.052c-0.002-0.008,0.001-0.017-0.001-0.025c-0.004-0.012-0.016-0.028-0.021-0.04
+  c-0.008-0.018-0.015-0.031-0.02-0.051c-0.003-0.012-0.021-0.054,0.006-0.037C-32.866,55.611-32.865,55.641-32.86,55.655z
+  M-31.614,57.091c0.006,0.006,0.009,0.014,0.014,0.021c0.002,0.003,0.004,0.007,0.007,0.011c0.001,0.001,0.003,0.002,0.004,0.004
+  c0.002,0.003,0.005,0.004,0.007,0.006c0.002,0.002,0.004,0.005,0.006,0.008c0.003,0.004,0.005,0.008,0.008,0.013
+  c0.003,0.005,0.006,0.011,0.009,0.017c0.001,0.004,0.004,0.007,0.008,0.01c0.003,0.002,0.004,0.005,0.006,0.009
+  c0.002,0.003,0.003,0.008,0.006,0.011c0.004,0.004,0.007,0.009,0.008,0.014c0.002,0.005,0.003,0.009,0.005,0.014
+  c0.001,0.002,0.002,0.004,0.004,0.006c0.002,0.002,0.005,0.003,0.007,0.006c0.002,0.003,0.005,0.005,0.007,0.008
+  c0.001,0.002,0.002,0.004,0.004,0.006c0.001,0.003,0.004,0.006,0.007,0.009c0.001,0.001,0.003,0.002,0.004,0.004
+  c0.001,0.001,0.002,0.002,0.002,0.003c0.003,0.005,0.007,0.01,0.009,0.015c0.003,0.009,0.007,0.017,0.011,0.025
+  c0.001,0.003,0.002,0.007,0.004,0.01c0.001,0.002,0.005,0.007,0.004,0.009c-0.001,0-0.004-0.004-0.004-0.005
+  c-0.002-0.002-0.003-0.003-0.005-0.005c-0.004-0.003-0.008-0.007-0.013-0.01c-0.003-0.002-0.007-0.005-0.009-0.008
+  c-0.001-0.002-0.003-0.003-0.004-0.005c-0.001-0.002-0.003-0.004-0.004-0.007c-0.001-0.002-0.002-0.004-0.004-0.006
+  c-0.001-0.001-0.003-0.002-0.004-0.003c-0.003-0.004-0.003-0.009-0.005-0.013c-0.002-0.003-0.004-0.005-0.007-0.007
+  c-0.003-0.004-0.005-0.008-0.007-0.012c-0.002-0.003-0.003-0.007-0.005-0.01c-0.002-0.005-0.004-0.01-0.007-0.014
+  c-0.005-0.007-0.011-0.014-0.016-0.021c-0.002-0.004-0.006-0.007-0.008-0.011c-0.003-0.004-0.006-0.008-0.008-0.012
+  c-0.005-0.007-0.009-0.015-0.014-0.022c-0.003-0.004-0.007-0.008-0.01-0.012c-0.003-0.003-0.005-0.008-0.006-0.012
+  c-0.002-0.004-0.003-0.008-0.006-0.012c-0.001-0.001-0.002-0.002-0.002-0.004c-0.001,0-0.001-0.001-0.001-0.001s0,0,0-0.001
+  c-0.001-0.001-0.001-0.002-0.002-0.004c0-0.002-0.001-0.002-0.001-0.003s0-0.002,0-0.003s-0.001-0.001-0.001-0.002
+  c0-0.001,0-0.002-0.001-0.003c-0.001-0.004-0.003-0.007-0.004-0.01c-0.001-0.002-0.001-0.004,0.001-0.004
+  C-31.618,57.088-31.615,57.09-31.614,57.091z M-31.125,57.71c0.016,0.015,0.034,0.023,0.052,0.036
+  c0.023,0.015,0.041,0.038,0.063,0.054c0.033,0.024,0.065,0.05,0.1,0.072c0.018,0.011,0.033,0.026,0.051,0.039
+  c0.014,0.01,0.034,0.018,0.042,0.034c-0.014,0.003-0.039-0.014-0.053-0.019c-0.014-0.004-0.044-0.007-0.051-0.022l0,0
+  c-0.026-0.02-0.048-0.046-0.072-0.069c-0.023-0.022-0.049-0.034-0.069-0.058c-0.027-0.032-0.054-0.036-0.09-0.055
+  c-0.018-0.009-0.059-0.045-0.062-0.068c0.023-0.02,0.031,0.013,0.043,0.024C-31.158,57.69-31.14,57.698-31.125,57.71z
+  M-22.303,59.124c0.005-0.006,0.012-0.01,0.017-0.016c0.004-0.007,0.003-0.01,0.006-0.016c0.004-0.01,0.012-0.017,0.017-0.027
+  c0.001-0.002,0.002-0.01,0.003-0.012c0.003-0.005,0.008-0.009,0.013-0.015c0.009-0.01,0.011-0.012,0.026-0.012
+  c0.01,0.001,0.018-0.002,0.027-0.005c0.01-0.004,0.022-0.01,0.032-0.011c0.005-0.001,0.012,0,0.017,0
+  c0.009,0,0.013-0.002,0.022-0.004c0.012-0.003,0.021-0.004,0.033-0.011c0.007-0.004,0.013-0.008,0.021-0.012
+  c0.01-0.005,0.018-0.01,0.026-0.018c0.003-0.003,0.005-0.006,0.008-0.008c0.005-0.004,0.009-0.005,0.014-0.008
+  c0.014-0.011,0.017-0.026,0.027-0.039c0.011-0.016,0.034-0.026,0.049-0.037c0.006-0.005,0.01-0.012,0.017-0.017
+  c0.01-0.006,0.022-0.011,0.033-0.015c0.019-0.007,0.035-0.021,0.055-0.026c0.019-0.004,0.046-0.006,0.064-0.019
+  c0.015-0.01,0.029-0.025,0.046-0.035c0.005-0.003,0.019-0.011,0.025-0.006c0.008,0.008-0.004,0.018-0.009,0.022
+  c-0.012,0.012-0.026,0.02-0.038,0.033c-0.013,0.014-0.027,0.028-0.041,0.041c-0.005,0.004-0.012,0.01-0.016,0.016
+  c-0.006,0.009-0.005,0.02-0.009,0.029c-0.012,0.023-0.036,0.037-0.055,0.053c-0.007,0.006-0.012,0.011-0.018,0.017
+  c-0.011,0.012-0.017,0.025-0.027,0.039c-0.014,0.021-0.051,0.038-0.075,0.042c-0.012,0.002-0.025,0-0.037,0.002
+  c-0.009,0.002-0.019,0.008-0.029,0.011c-0.011,0.003-0.028,0.009-0.036,0.016c-0.005,0.005-0.007,0.011-0.012,0.016
+  c-0.005,0.004-0.011,0.007-0.016,0.01c-0.009,0.006-0.018,0.015-0.027,0.021c-0.017,0.01-0.037,0.015-0.054,0.023
+  c-0.013,0.006-0.021,0.004-0.034,0.005c-0.011,0.002-0.021,0.007-0.032,0.01c-0.011,0.003-0.027,0.003-0.038,0.001
+  c-0.01-0.001-0.016-0.005-0.025-0.005l0.003-0.006C-22.321,59.142-22.312,59.134-22.303,59.124z M-22.336,59.162
+  c-0.004,0.001-0.005-0.001-0.005-0.004c0.003-0.001,0.006-0.001,0.008-0.001L-22.336,59.162z M-21.881,59.028
+  c-0.01-0.011,0.016-0.024,0.024-0.029c0.007-0.004,0.016-0.006,0.023-0.009c0.005-0.002,0.008-0.003,0.011-0.006
+  c0.005-0.002,0.007-0.009,0.011-0.011c0.006-0.004,0.015-0.002,0.022-0.005c0.007-0.004,0.014-0.009,0.02-0.013
+  c0.009-0.005,0.047-0.031,0.044-0.005c0,0.005-0.007,0.018-0.01,0.022c-0.003,0.006-0.008,0.011-0.012,0.016
+  c-0.008,0.011-0.02,0.027-0.034,0.032c-0.008,0.002-0.016,0-0.024,0.002c-0.009,0.002-0.014,0.008-0.023,0.01
+  c-0.011,0.002-0.023,0-0.033,0c-0.013-0.001-0.021,0.004-0.033,0.005l0.011-0.005C-21.883,59.03-21.882,59.029-21.881,59.028z
+  M-23.012,48.049c0.012-0.009,0.023-0.017,0.03-0.03c0.003-0.007,0.004-0.011,0.011-0.014c0.006-0.002,0.012-0.003,0.018-0.003
+  c0.025-0.001,0.044,0.01,0.051,0.036c0.005,0.018,0.007,0.037,0.01,0.056c0.002,0.017,0.009,0.033,0.012,0.05
+  c0.002,0.014,0.004,0.027,0.001,0.041c-0.003,0.013-0.006,0.019-0.018,0.024c-0.024,0.011-0.052,0.005-0.076,0
+  c-0.008-0.002-0.016-0.005-0.022-0.01c-0.007-0.005-0.012-0.013-0.021-0.014h0.013c-0.003,0-0.005-0.003-0.008-0.005
+  c-0.006-0.006-0.01-0.008-0.014-0.015c-0.005-0.008-0.012-0.014-0.015-0.023c-0.003-0.006-0.005-0.014-0.006-0.021
+  c-0.001-0.014-0.002-0.033,0.006-0.046C-23.032,48.063-23.023,48.056-23.012,48.049z M-22.19,43.243
+  c0.013,0.002,0.025,0.012,0.037,0.018c0.011,0.005,0.021,0,0.032,0.003c0.005,0.001,0.005,0.005,0.01,0.006
+  c0.007,0.002,0.014-0.002,0.021-0.001c0.01,0.002,0.018,0.007,0.026,0.012c0.007,0.004,0.012,0.01,0.019,0.014
+  c0.008,0.005,0.017,0.005,0.024,0.013c0.007,0.007,0.016,0.02,0.005,0.025c-0.002,0.001-0.013,0.003-0.016,0.004
+  c-0.008,0.002-0.014,0.004-0.021,0.008c-0.01,0.005-0.016,0.01-0.026,0.014c-0.005,0.002-0.005,0.005-0.011,0.005
+  c-0.005,0-0.014-0.005-0.021-0.005c-0.023,0-0.044-0.011-0.066-0.01c-0.002-0.002-0.004-0.005-0.006-0.007
+  c-0.01-0.01-0.019-0.021-0.027-0.032c-0.006-0.007-0.011-0.016-0.017-0.024c-0.011-0.018,0.002-0.022,0.015-0.033
+  C-22.204,43.246-22.201,43.241-22.19,43.243z M-22.195,43.354c0.006-0.003,0.012-0.004,0.018-0.005
+  c0.002,0.002,0.005,0.004,0.007,0.005H-22.195z M-21.865,43.386c0.003-0.011,0-0.022,0.001-0.032
+  c0.001-0.003,0.005-0.01,0.005-0.012c0.001-0.008-0.003-0.011-0.005-0.02c-0.002-0.015-0.002-0.047,0.016-0.053
+  c0.009-0.002,0.024,0.001,0.033,0.001c0.017,0,0.031,0,0.047-0.006c0.02-0.007,0.035-0.012,0.057-0.006
+  c0.024,0.006,0.042-0.011,0.063,0.003c0.015,0.009,0.031,0.023,0.039,0.039c0.009,0.019,0.009,0.042,0.009,0.065
+  c0,0.019-0.004,0.044,0.004,0.063c0.009,0.02,0.024,0.035,0.038,0.052c0.015,0.018,0.027,0.036,0.038,0.057
+  c0.004,0.008,0.008,0.013,0.009,0.022c0.003,0.017,0.001,0.021-0.015,0.021c-0.02,0-0.037-0.013-0.053-0.025
+  c-0.023-0.016-0.058-0.029-0.086-0.036c-0.024-0.007-0.046-0.017-0.071-0.022c-0.015-0.003-0.025,0.004-0.038,0.003
+  c-0.01,0-0.021-0.008-0.031-0.009c-0.011-0.001-0.021-0.002-0.031-0.006c-0.003-0.001-0.009-0.007-0.012-0.009
+  c-0.004-0.002-0.011-0.005-0.014-0.007c-0.007-0.007-0.005-0.017-0.011-0.023l0.004,0.003
+  C-21.886,43.435-21.868,43.401-21.865,43.386z"/>
+</svg>
diff --git a/browser/components/readinglist/ReadingList.jsm b/browser/components/readinglist/ReadingList.jsm
index 259be3c795c9..bc97fc2c8415 100644
--- a/browser/components/readinglist/ReadingList.jsm
+++ b/browser/components/readinglist/ReadingList.jsm
@@ -712,6 +712,14 @@ ReadingListItem.prototype = {
     this._properties.readPosition = val;
   },
 
+  /**
+   * The URL to a preview image.
+   * @type string
+   */
+   get preview() {
+     return this._properties.preview;
+   },
+
   /**
    * Sets the given properties of the item, optionally calling list.updateItem().
    *
diff --git a/browser/components/readinglist/sidebar.js b/browser/components/readinglist/sidebar.js
index e4e3a5c833b5..b2d123e48ee0 100644
--- a/browser/components/readinglist/sidebar.js
+++ b/browser/components/readinglist/sidebar.js
@@ -139,6 +139,12 @@ let RLSidebar = {
 
     itemNode.querySelector(".item-title").textContent = item.title;
     itemNode.querySelector(".item-domain").textContent = item.domain;
+    let thumb = itemNode.querySelector(".item-thumb-container");
+    if (item.preview) {
+      thumb.style.backgroundImage = "url(" + item.preview + ")";
+    } else {
+      thumb.style.removeProperty("background-image");
+    }
   },
 
   /**
diff --git a/browser/themes/shared/readinglist/sidebar.inc.css b/browser/themes/shared/readinglist/sidebar.inc.css
index b198f909cc75..da49e55dfefc 100644
--- a/browser/themes/shared/readinglist/sidebar.inc.css
+++ b/browser/themes/shared/readinglist/sidebar.inc.css
@@ -47,10 +47,14 @@ body {
   max-width: 64px;
   min-height: 40px;
   max-height: 40px;
-  background: #EBEBEB;
   border: 1px solid white;
   box-shadow: 0px 1px 2px rgba(0,0,0,.35);
   margin: 5px;
+  background-color: #fff;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-image: url("chrome://branding/content/silhouette-40.svg");
 }
 
 .item-summary-container {

From d48db7924b7ebd25e1f380df02044444559cf1a8 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 20 Mar 2015 14:33:54 -0400
Subject: [PATCH 80/80] Backed out changeset c4915d92b0c5 (bug 1113471) for
 test_osfile_back.xul failures.

---
 dom/system/OSFileConstants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/system/OSFileConstants.cpp b/dom/system/OSFileConstants.cpp
index d9d55e252e7b..aef51f0188e3 100644
--- a/dom/system/OSFileConstants.cpp
+++ b/dom/system/OSFileConstants.cpp
@@ -709,7 +709,7 @@ static const dom::ConstantSpec gWinProperties[] =
   // CreateFile desired access
   INT_CONSTANT(GENERIC_ALL),
   INT_CONSTANT(GENERIC_EXECUTE),
-  UINT_CONSTANT(GENERIC_READ),
+  INT_CONSTANT(GENERIC_READ),
   INT_CONSTANT(GENERIC_WRITE),
 
   // CreateFile share mode