Version 2.6.1

* Cherry-pick cfe29c45fdc4367b1cece295408684bb5e5e8edd to stable
* Cherry-pick e65d95e8c869a6ef26a5fdb6951267ea06c3e6fe to stable
* Cherry-pick 6354b0b97dced6c0cdee8f22009b4351f0095d75 to stable
* Cherry-pick 64b0bfac68138405a6de4aa2c0d1082948137d97 to stable
diff --git a/tools/VERSION b/tools/VERSION
index b2fe8b5..756dd00 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -32,7 +32,7 @@
 CHANNEL stable
 MAJOR 2
 MINOR 6
-PATCH 0
+PATCH 1
 PRERELEASE 0
 PRERELEASE_PATCH 0
 ABI_VERSION 19