Merge branch '1.x' into 2.x

# Conflicts:
#	package.json

Author: timkelty

package.json

@@ -21,6 +21,5 @@
   },
   "engines": {
     "node": "^18"
-  },
-  "version": "2.2.1"
+  }
 }