Merge branch '2.17' into 2.18

cowtowncoder · cowtowncoder · commit f267b169b7a1 · 2024-07-24T20:39:45.000-07:00
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -91,6 +91,8 @@ Active maintainers:
   are no longer leaked
  (contributed by @tgregg)
 
+=======
+>>>>>>> 2.16
 2.16.2 (09-Mar-2024)
 
 No changes since 2.16.1
