Merge remote-tracking branch 'origin/master'

Makefile

@@ -83,7 +83,7 @@ po:
 
 .PHONY: po2json
 po2json:
-	find ./locale -maxdepth 1 -mindepth 1 -type d -exec $(PO2JSON) -p -f jed -d converse {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
+	find ./locale -maxdepth 1 -mindepth 1 -type d -exec $(PO2JSON) -f jed1.x -d converse {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
 
 ########################################################################
 ## Release management

package-lock.json

@@ -3848,9 +3848,9 @@
       }
     },
     "install": {
-      "version": "0.8.9",
-      "resolved": "https://registry.npmjs.org/install/-/install-0.8.9.tgz",
-      "integrity": "sha1-n0tcDRhR74cunfheT3Fi1OXc2+0=",
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/install/-/install-0.9.6.tgz",
+      "integrity": "sha1-vuFqdC1yubSh91CxlSwPQ74eO4A=",
       "dev": true
     },
     "interpret": {
@@ -4136,9 +4136,9 @@
       "dev": true
     },
     "jed": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/jed/-/jed-0.5.4.tgz",
-      "integrity": "sha1-rtFA1cTWWs89qli5Gd1WElP2QcI=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
+      "integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ=",
       "dev": true
     },
     "jquery": {