Merge branch 'master' into flame

diff --cc Cargo.lock
index c5a335613423714a6c3d5b15fa561e55047cbf48,ef0cb578c4922cbc02244cf52dfa66550ec314ab..14652313efe21369374470de7fcea85aeb9d9ea5
--- 1/Cargo.lock
--- 2/Cargo.lock
+++ b/Cargo.lock
@@@ -2487,7 -2331,8 +2476,8 @@@ dependencies = 
   "git-version",
   "hostname",
   "iai-callgrind",
 - "indexmap",
 + "indexmap 1.9.3",
+  "js-sys",
   "lazy_static",
   "lexical",
   "libc",

diff --cc Cargo.toml
Simple merge