From ba925fd98621b1b9d6955be78d8092039c187d61 Mon Sep 17 00:00:00 2001
From: Andrew Brown <andrew.brown@intel.com>
Date: Fri, 6 Aug 2021 11:19:05 -0700
Subject: [PATCH 1/2] Add memory64 row to feature table

---
 features.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/features.json b/features.json
index cdad18bf..4deb00c0 100644
--- a/features.json
+++ b/features.json
@@ -64,6 +64,11 @@
 			"description": "Threads and atomics",
 			"url": "https://github.com/WebAssembly/threads/blob/master/proposals/threads/Overview.md",
 			"phase": 2
+		},
+		"memory64": {
+			"description": "Memory64",
+			"url": "https://github.com/WebAssembly/memory64/blob/master/proposals/memory64/Overview.md",
+			"phase": 3
 		}
 	},
 	"browsers": {

From 7bf1d508c123b5f8ee52eeee510246a8e5db2b88 Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <me@rreverser.com>
Date: Fri, 5 Nov 2021 10:09:48 +0000
Subject: [PATCH 2/2] Sort memory64 & add Wasmtime flag

---
 features.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/features.json b/features.json
index 4deb00c0..76234cbc 100644
--- a/features.json
+++ b/features.json
@@ -20,6 +20,11 @@
 			"url": "https://github.com/WebAssembly/extended-const/blob/master/proposals/extended-const/Overview.md",
 			"phase": 1
 		},
+		"memory64": {
+			"description": "Memory64",
+			"url": "https://github.com/WebAssembly/memory64/blob/master/proposals/memory64/Overview.md",
+			"phase": 3
+		},
 		"moduleLinking": {
 			"description": "Module Linking",
 			"url": "https://github.com/WebAssembly/module-linking/blob/master/proposals/module-linking/Explainer.md",
@@ -64,11 +69,6 @@
 			"description": "Threads and atomics",
 			"url": "https://github.com/WebAssembly/threads/blob/master/proposals/threads/Overview.md",
 			"phase": 2
-		},
-		"memory64": {
-			"description": "Memory64",
-			"url": "https://github.com/WebAssembly/memory64/blob/master/proposals/memory64/Overview.md",
-			"phase": 3
 		}
 	},
 	"browsers": {
@@ -126,10 +126,11 @@
 		"Wasmtime": {
 			"url": "https://wasmtime.dev/",
 			"logo": "/images/bca.png",
-			"version": "0.22",
+			"version": "0.31",
 			"features": {
 				"bigInt": null,
 				"bulkMemory": true,
+				"memory64": "--enable-memory64",
 				"moduleLinking": "--enable-module-linking",
 				"multiValue": true,
 				"mutableGlobals": true,