Merge commit '8ccb7f08d' into anoa/dinsic_release_1_18_x

* commit '8ccb7f08d':
  update changelog

2 files changed, 2 insertions, 2 deletions

diff --git a/CHANGES.md b/CHANGES.md

index 9c156657c6..e6e575e5e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ table.
 Bugfixes
 --------
 
-- Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816))
+- Drop table `local_rejections_stream` which was incorrectly added in Synapse 1.16.0. ([\#7816](https://github.com/matrix-org/synapse/issues/7816), [b1beb3ff5](https://github.com/matrix-org/synapse/commit/b1beb3ff5))
 
 
 Synapse 1.17.0rc1 (2020-07-09)
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 0116478fbb..5bb09a37d7 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.16.1"
+__version__ = "1.17.0rc1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when