Version 2.8.1

* Cherry-pick 64c9984ecfd531eb381a56eacac8b8b8fc83dfb6 to stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f024462..90d3ea8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.8.0
+## 2.8.1 - 2020-05-06
 
 Much of the changes in this release are in preparation for non-nullable types,
 which will arrive in a future version. In anticipation of that, we have made a
diff --git a/tools/VERSION b/tools/VERSION
index 28289b5..aa5de78 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -32,7 +32,7 @@
 CHANNEL stable
 MAJOR 2
 MINOR 8
-PATCH 0
+PATCH 1
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 32