Merge upstream into firefox-port

# Conflicts:
#	inject.js

popup.js

@@ -1,6 +1,6 @@
 document.addEventListener('DOMContentLoaded', function () {
   document.querySelector('#config').addEventListener('click', function() {
-    window.open(chrome.extension.getURL("options.html"));
+    window.open(chrome.runtime.getURL("options.html"));
   });
   
   document.querySelector('#about').addEventListener('click', function() {