Merge remote-tracking branch 'mozilla/master' into textsearch

Conflicts:
	extensions/firefox/components/PdfStreamConverter.js

diff --cc extensions/firefox/components/PdfStreamConverter.js
index f866a6b2fd77630d33b24fef4c2205a50556c00d,2c984e86cd19c216f41b86f6f88056498799d5aa..f7ed3cd3a3693e33357f9b178b15275d1cdd3d55
--- 1/extensions/firefox/components/PdfStreamConverter.js
--- 2/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@@ -160,10 -160,7 +160,10 @@@ ChromeActions.prototype = 
      }
    },
    pdfBugEnabled: function() {
-     return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false);
+     return getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false);
 +  },
 +  searchEnabled: function() {
-     return getBoolPref(EXT_PREFIX + '.searchEnabled', false);
++    return getBoolPref(PREF_PREFIX + '.searchEnabled', false);
    }
  };
  

diff --cc src/evaluator.js
Simple merge

diff --cc src/fonts.js
Simple merge