diff --git a/CHANGES.md b/CHANGES.md
index 45d3cdb1314bfd60f198a52a458054e9b70ce400..e9b491559e29f199011f57e5259c3365bc94aa52 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,78 @@
+Synapse 0.33.6rc1 (2018-10-03)
+==============================
+
+Features
+--------
+
+- Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables. ([\#3883](https://github.com/matrix-org/synapse/issues/3883))
+- Report "python_version" in the phone home stats ([\#3894](https://github.com/matrix-org/synapse/issues/3894))
+- Always LL ourselves if we're in a room ([\#3916](https://github.com/matrix-org/synapse/issues/3916))
+- Include eventid in log lines when processing incoming federation transactions ([\#3959](https://github.com/matrix-org/synapse/issues/3959))
+- Remove spurious check which made 'localhost' servers not work ([\#3964](https://github.com/matrix-org/synapse/issues/3964))
+
+
+Bugfixes
+--------
+
+- Fix problem when playing media from Chrome using direct URL (thanks @remjey!) ([\#3578](https://github.com/matrix-org/synapse/issues/3578))
+- support registering regular users non-interactively with register_new_matrix_user script ([\#3836](https://github.com/matrix-org/synapse/issues/3836))
+- Fix broken invite email links for self hosted riots ([\#3868](https://github.com/matrix-org/synapse/issues/3868))
+- Don't ratelimit autojoins ([\#3879](https://github.com/matrix-org/synapse/issues/3879))
+- Fix 500 error when deleting unknown room alias ([\#3889](https://github.com/matrix-org/synapse/issues/3889))
+- Fix some b'abcd' noise in logs and metrics ([\#3892](https://github.com/matrix-org/synapse/issues/3892), [\#3895](https://github.com/matrix-org/synapse/issues/3895))
+- When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers. ([\#3899](https://github.com/matrix-org/synapse/issues/3899))
+- Fix incorrect server-name indication for outgoing federation requests ([\#3907](https://github.com/matrix-org/synapse/issues/3907))
+- Fix adding client IPs to the database failing on Python 3. ([\#3908](https://github.com/matrix-org/synapse/issues/3908))
+- Fix bug where things occaisonally were not being timed out correctly. ([\#3910](https://github.com/matrix-org/synapse/issues/3910))
+- Fix bug where outbound federation would stop talking to some servers when using workers ([\#3914](https://github.com/matrix-org/synapse/issues/3914))
+- Fix some instances of ExpiringCache not expiring cache items ([\#3932](https://github.com/matrix-org/synapse/issues/3932), [\#3980](https://github.com/matrix-org/synapse/issues/3980))
+- Fix out-of-bounds error when LLing yourself ([\#3936](https://github.com/matrix-org/synapse/issues/3936))
+- Sending server notices regarding user consent now works on Python 3. ([\#3938](https://github.com/matrix-org/synapse/issues/3938))
+- Fix exceptions from metrics handler ([\#3956](https://github.com/matrix-org/synapse/issues/3956))
+- Fix error message for events with m.room.create missing from auth_events ([\#3960](https://github.com/matrix-org/synapse/issues/3960))
+- Fix errors due to concurrent monthly_active_user upserts ([\#3961](https://github.com/matrix-org/synapse/issues/3961))
+- Fix exceptions when processing incoming events over federation ([\#3968](https://github.com/matrix-org/synapse/issues/3968))
+- Replaced all occurences of e.message with str(e). Contributed by Schnuffle ([\#3970](https://github.com/matrix-org/synapse/issues/3970))
+- Fix lazy loaded sync in the presence of rejected state events ([\#3986](https://github.com/matrix-org/synapse/issues/3986))
+- Fix error when logging incomplete HTTP requests ([\#3990](https://github.com/matrix-org/synapse/issues/3990))
+- Add a cache to get_destination_retry_timings ([\#3991](https://github.com/matrix-org/synapse/issues/3991))
+
+
+Internal Changes
+----------------
+
+- Unit tests can now be run under PostgreSQL in Docker using 
+  ``test_postgresql.sh``. ([\#3699](https://github.com/matrix-org/synapse/issues/3699))
+- Speed up calculation of typing updates for replication ([\#3794](https://github.com/matrix-org/synapse/issues/3794))
+- Remove documentation regarding installation on Cygwin, the use of WSL is 
+  recommended instead. ([\#3873](https://github.com/matrix-org/synapse/issues/3873))
+- Fix typo in README, synaspse -> synapse ([\#3897](https://github.com/matrix-org/synapse/issues/3897))
+- Increase the timeout when filling missing events in federation requests ([\#3903](https://github.com/matrix-org/synapse/issues/3903))
+- Improve the logging when handling a federation transaction ([\#3904](https://github.com/matrix-org/synapse/issues/3904), [\#3966](https://github.com/matrix-org/synapse/issues/3966))
+- Improve logging of outbound federation requests ([\#3906](https://github.com/matrix-org/synapse/issues/3906), [\#3909](https://github.com/matrix-org/synapse/issues/3909))
+- Fix the docker image building on python 3 ([\#3911](https://github.com/matrix-org/synapse/issues/3911))
+- Add a regression test for logging failed HTTP requests on Python 3. ([\#3912](https://github.com/matrix-org/synapse/issues/3912))
+- Comments and interface cleanup for on_receive_pdu ([\#3924](https://github.com/matrix-org/synapse/issues/3924))
+- Fix spurious exceptions when remote http client closes conncetion ([\#3925](https://github.com/matrix-org/synapse/issues/3925))
+- Log exceptions thrown by background tasks ([\#3927](https://github.com/matrix-org/synapse/issues/3927))
+- Add a cache to get_destination_retry_timings ([\#3933](https://github.com/matrix-org/synapse/issues/3933))
+- Automate pushes to docker hub ([\#3946](https://github.com/matrix-org/synapse/issues/3946))
+- Require attrs 16.0.0 or later ([\#3947](https://github.com/matrix-org/synapse/issues/3947))
+- Fix incompatibility with python3 on alpine ([\#3948](https://github.com/matrix-org/synapse/issues/3948))
+- Run the test suite on the oldest supported versions of our dependencies in CI. ([\#3952](https://github.com/matrix-org/synapse/issues/3952))
+- CircleCI now only runs merged jobs on PRs, and commit jobs on develop, master, and release branches. ([\#3957](https://github.com/matrix-org/synapse/issues/3957))
+- Fix docstrings and add tests for state store methods ([\#3958](https://github.com/matrix-org/synapse/issues/3958))
+- fix docstring for FederationClient.get_state_for_room ([\#3963](https://github.com/matrix-org/synapse/issues/3963))
+- Run notify_app_services as a bg process ([\#3965](https://github.com/matrix-org/synapse/issues/3965))
+- Clarifications in FederationHandler ([\#3967](https://github.com/matrix-org/synapse/issues/3967))
+- Further reduce the docker image size ([\#3972](https://github.com/matrix-org/synapse/issues/3972))
+- Build py3 docker images for docker hub too ([\#3976](https://github.com/matrix-org/synapse/issues/3976))
+- Updated the installation instructions to point to the matrix-synapse package on PyPI. ([\#3985](https://github.com/matrix-org/synapse/issues/3985))
+- Disable USE_FROZEN_DICTS for unittests by default. ([\#3987](https://github.com/matrix-org/synapse/issues/3987))
+- Remove unused Jenkins and development related files from the repo. ([\#3988](https://github.com/matrix-org/synapse/issues/3988))
+- Improve stacktraces in certain exceptions in the logs ([\#3989](https://github.com/matrix-org/synapse/issues/3989))
+
+
 Synapse 0.33.5.1 (2018-09-25)
 =============================
 
diff --git a/changelog.d/3578.bugfix b/changelog.d/3578.bugfix
deleted file mode 100644
index 9c52b6fa7e92f9df356e79fdab4308d3d40c3e3d..0000000000000000000000000000000000000000
--- a/changelog.d/3578.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix problem when playing media from Chrome using direct URL (thanks @remjey!)
diff --git a/changelog.d/3699.misc b/changelog.d/3699.misc
deleted file mode 100644
index 437efbd98f13ee5f9a909dfb4fbde2281ac012a5..0000000000000000000000000000000000000000
--- a/changelog.d/3699.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Unit tests can now be run under PostgreSQL in Docker using 
-``test_postgresql.sh``.
diff --git a/changelog.d/3794.misc b/changelog.d/3794.misc
deleted file mode 100644
index 6b98c9609b18c3a52918322f285b196191f0d1e5..0000000000000000000000000000000000000000
--- a/changelog.d/3794.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up calculation of typing updates for replication
diff --git a/changelog.d/3836.bugfix b/changelog.d/3836.bugfix
deleted file mode 100644
index add49fbec0d5bb661c26cc84992185367557cd78..0000000000000000000000000000000000000000
--- a/changelog.d/3836.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-support registering regular users non-interactively with register_new_matrix_user script
\ No newline at end of file
diff --git a/changelog.d/3868.bugfix b/changelog.d/3868.bugfix
deleted file mode 100644
index 99da8389a5e79f5dd3c8a7f6b3035e7f573f7ac2..0000000000000000000000000000000000000000
--- a/changelog.d/3868.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken invite email links for self hosted riots 
diff --git a/changelog.d/3873.misc b/changelog.d/3873.misc
deleted file mode 100644
index 8104b5c085f624299a082cf4cf45005100a788b4..0000000000000000000000000000000000000000
--- a/changelog.d/3873.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove documentation regarding installation on Cygwin, the use of WSL is 
-recommended instead.
diff --git a/changelog.d/3879.bugfix b/changelog.d/3879.bugfix
deleted file mode 100644
index 82cb2a8ebc49d90ad48cd7543cff21616f600de7..0000000000000000000000000000000000000000
--- a/changelog.d/3879.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't ratelimit autojoins
diff --git a/changelog.d/3883.feature b/changelog.d/3883.feature
deleted file mode 100644
index c11e5c53090e82a570f3da654a47c7491a107b49..0000000000000000000000000000000000000000
--- a/changelog.d/3883.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.
\ No newline at end of file
diff --git a/changelog.d/3889.bugfix b/changelog.d/3889.bugfix
deleted file mode 100644
index e97642598757e1bbc838f847018f7030cd765ffb..0000000000000000000000000000000000000000
--- a/changelog.d/3889.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix 500 error when deleting unknown room alias
diff --git a/changelog.d/3892.bugfix b/changelog.d/3892.bugfix
deleted file mode 100644
index 8b30afab040a4417b487c5d341440c48f10f9614..0000000000000000000000000000000000000000
--- a/changelog.d/3892.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some b'abcd' noise in logs and metrics
diff --git a/changelog.d/3894.feature b/changelog.d/3894.feature
deleted file mode 100644
index 1ed0cccdb2530c89bc81f2672c252d2e4ede6d3b..0000000000000000000000000000000000000000
--- a/changelog.d/3894.feature
+++ /dev/null
@@ -1 +0,0 @@
-Report "python_version" in the phone home stats
diff --git a/changelog.d/3895.bugfix b/changelog.d/3895.bugfix
deleted file mode 100644
index 8b30afab040a4417b487c5d341440c48f10f9614..0000000000000000000000000000000000000000
--- a/changelog.d/3895.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some b'abcd' noise in logs and metrics
diff --git a/changelog.d/3897.misc b/changelog.d/3897.misc
deleted file mode 100644
index 87e7ac796e3c70877578a4d4b0330fa6b057fa9f..0000000000000000000000000000000000000000
--- a/changelog.d/3897.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typo in README, synaspse -> synapse
\ No newline at end of file
diff --git a/changelog.d/3899.bugfix b/changelog.d/3899.bugfix
deleted file mode 100644
index 5120e3a8230998cf898e61f27bb560899d08c9e7..0000000000000000000000000000000000000000
--- a/changelog.d/3899.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-When we join a room, always try the server we used for the alias lookup first, to avoid unresponsive and out-of-date servers.
diff --git a/changelog.d/3903.misc b/changelog.d/3903.misc
deleted file mode 100644
index 49b64bf33355e1a71b8127bd4b323e4c0876822c..0000000000000000000000000000000000000000
--- a/changelog.d/3903.misc
+++ /dev/null
@@ -1 +0,0 @@
-Increase the timeout when filling missing events in federation requests
\ No newline at end of file
diff --git a/changelog.d/3904.misc b/changelog.d/3904.misc
deleted file mode 100644
index 1e3c8e1706ca0974f2f8a3f92cf11a3170616cbb..0000000000000000000000000000000000000000
--- a/changelog.d/3904.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the logging when handling a federation transaction
\ No newline at end of file
diff --git a/changelog.d/3906.misc b/changelog.d/3906.misc
deleted file mode 100644
index 11709186d3e4f8aff6a3055f87c054fe181d5553..0000000000000000000000000000000000000000
--- a/changelog.d/3906.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve logging of outbound federation requests
\ No newline at end of file
diff --git a/changelog.d/3907.bugfix b/changelog.d/3907.bugfix
deleted file mode 100644
index 45e010c0521d136a5982d220c5cdfe81f5ffd883..0000000000000000000000000000000000000000
--- a/changelog.d/3907.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect server-name indication for outgoing federation requests
\ No newline at end of file
diff --git a/changelog.d/3908.bugfix b/changelog.d/3908.bugfix
deleted file mode 100644
index 518aee6c4d2ed855641b9d6c836b72a31e700926..0000000000000000000000000000000000000000
--- a/changelog.d/3908.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix adding client IPs to the database failing on Python 3.
\ No newline at end of file
diff --git a/changelog.d/3909.misc b/changelog.d/3909.misc
deleted file mode 100644
index 11709186d3e4f8aff6a3055f87c054fe181d5553..0000000000000000000000000000000000000000
--- a/changelog.d/3909.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve logging of outbound federation requests
\ No newline at end of file
diff --git a/changelog.d/3910.bugfix b/changelog.d/3910.bugfix
deleted file mode 100644
index 22ec2adc33d5d8122f54fab03cf043501d944a23..0000000000000000000000000000000000000000
--- a/changelog.d/3910.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where things occaisonally were not being timed out correctly.
diff --git a/changelog.d/3911.misc b/changelog.d/3911.misc
deleted file mode 100644
index e31311d52048ff9f1939d16c667f35a8ada08a4e..0000000000000000000000000000000000000000
--- a/changelog.d/3911.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix the docker image building on python 3
diff --git a/changelog.d/3912.misc b/changelog.d/3912.misc
deleted file mode 100644
index 87d73697ea202ec935a644a7af483eb11b75c562..0000000000000000000000000000000000000000
--- a/changelog.d/3912.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a regression test for logging failed HTTP requests on Python 3.
\ No newline at end of file
diff --git a/changelog.d/3914.bugfix b/changelog.d/3914.bugfix
deleted file mode 100644
index 27e6bad59095f320a00b0a52a1f1ad03493d8b57..0000000000000000000000000000000000000000
--- a/changelog.d/3914.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where outbound federation would stop talking to some servers when using workers
diff --git a/changelog.d/3916.feature b/changelog.d/3916.feature
deleted file mode 100644
index 13282d992b9a051b5cc87cacd4faa9b3d9255194..0000000000000000000000000000000000000000
--- a/changelog.d/3916.feature
+++ /dev/null
@@ -1 +0,0 @@
-Always LL ourselves if we're in a room
diff --git a/changelog.d/3924.misc b/changelog.d/3924.misc
deleted file mode 100644
index 8d010e0bd9c5c7f57379fd37f7d314350887240e..0000000000000000000000000000000000000000
--- a/changelog.d/3924.misc
+++ /dev/null
@@ -1 +0,0 @@
-Comments and interface cleanup for on_receive_pdu
\ No newline at end of file
diff --git a/changelog.d/3925.misc b/changelog.d/3925.misc
deleted file mode 100644
index 3e41f78ff570f00f232f735ee4b68247333ee905..0000000000000000000000000000000000000000
--- a/changelog.d/3925.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix spurious exceptions when remote http client closes conncetion
diff --git a/changelog.d/3927.misc b/changelog.d/3927.misc
deleted file mode 100644
index 4bd8e25f67bb19c3c22f246f57a23745f0069f8d..0000000000000000000000000000000000000000
--- a/changelog.d/3927.misc
+++ /dev/null
@@ -1 +0,0 @@
-Log exceptions thrown by background tasks
diff --git a/changelog.d/3932.bugfix b/changelog.d/3932.bugfix
deleted file mode 100644
index 7578414ede72ca5b716725e723510aa6be89f52a..0000000000000000000000000000000000000000
--- a/changelog.d/3932.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some instances of ExpiringCache not expiring cache items
diff --git a/changelog.d/3933.misc b/changelog.d/3933.misc
deleted file mode 100644
index 6545871f55eba17a2532d3df94aa25200f0083a8..0000000000000000000000000000000000000000
--- a/changelog.d/3933.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a cache to get_destination_retry_timings
diff --git a/changelog.d/3936.bugfix b/changelog.d/3936.bugfix
deleted file mode 100644
index 49b02b9e278133f521a0507ba93a0b627a5f1f81..0000000000000000000000000000000000000000
--- a/changelog.d/3936.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix out-of-bounds error when LLing yourself
diff --git a/changelog.d/3938.bugfix b/changelog.d/3938.bugfix
deleted file mode 100644
index 01ccca21a7391c400307d83b0ae7db62a4a8d3ea..0000000000000000000000000000000000000000
--- a/changelog.d/3938.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Sending server notices regarding user consent now works on Python 3.
diff --git a/changelog.d/3946.misc b/changelog.d/3946.misc
deleted file mode 100644
index 803857a297f11271c1af19c46bbf256ff5a6fb0e..0000000000000000000000000000000000000000
--- a/changelog.d/3946.misc
+++ /dev/null
@@ -1 +0,0 @@
-Automate pushes to docker hub
diff --git a/changelog.d/3947.misc b/changelog.d/3947.misc
deleted file mode 100644
index 5a9a22bed9923b5d29b235fb9f7c2d829430a5ae..0000000000000000000000000000000000000000
--- a/changelog.d/3947.misc
+++ /dev/null
@@ -1 +0,0 @@
-Require attrs 16.0.0 or later
diff --git a/changelog.d/3948.misc b/changelog.d/3948.misc
deleted file mode 100644
index a93edbd1c3548939aae8c69237096f0977a56387..0000000000000000000000000000000000000000
--- a/changelog.d/3948.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix incompatibility with python3 on alpine
\ No newline at end of file
diff --git a/changelog.d/3952.misc b/changelog.d/3952.misc
deleted file mode 100644
index 015e4a43e6829e0a9409ee09d43542d749b4f246..0000000000000000000000000000000000000000
--- a/changelog.d/3952.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run the test suite on the oldest supported versions of our dependencies in CI.
\ No newline at end of file
diff --git a/changelog.d/3956.bugfix b/changelog.d/3956.bugfix
deleted file mode 100644
index b0828c9fc6325d7d7d9bee3bf59ac2249d6ccc29..0000000000000000000000000000000000000000
--- a/changelog.d/3956.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exceptions from metrics handler
\ No newline at end of file
diff --git a/changelog.d/3957.misc b/changelog.d/3957.misc
deleted file mode 100644
index 69d647f119cff9e5673136452dc0a9ad612b74b9..0000000000000000000000000000000000000000
--- a/changelog.d/3957.misc
+++ /dev/null
@@ -1 +0,0 @@
-CircleCI now only runs merged jobs on PRs, and commit jobs on develop, master, and release branches.
diff --git a/changelog.d/3958.misc b/changelog.d/3958.misc
deleted file mode 100644
index 5931d06dcff0e8c7fe50ded2b137b95805a2e368..0000000000000000000000000000000000000000
--- a/changelog.d/3958.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix docstrings and add tests for state store methods
diff --git a/changelog.d/3959.feature b/changelog.d/3959.feature
deleted file mode 100644
index b3a4f37a8da1f4b44e73caadee60fcb736f6aeb5..0000000000000000000000000000000000000000
--- a/changelog.d/3959.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include eventid in log lines when processing incoming federation transactions
\ No newline at end of file
diff --git a/changelog.d/3960.bugfix b/changelog.d/3960.bugfix
deleted file mode 100644
index a01dc60df6e5cbbd59a3c4e5f56cac29cc305fe2..0000000000000000000000000000000000000000
--- a/changelog.d/3960.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error message for events with m.room.create missing from auth_events
\ No newline at end of file
diff --git a/changelog.d/3961.bugfix b/changelog.d/3961.bugfix
deleted file mode 100644
index e46b5834aad03a886f76c7c672c7887b51b5f0de..0000000000000000000000000000000000000000
--- a/changelog.d/3961.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix errors due to concurrent monthly_active_user upserts 
diff --git a/changelog.d/3963.misc b/changelog.d/3963.misc
deleted file mode 100644
index f1e0eaf18e486e1953b330b12653b0d3017048d8..0000000000000000000000000000000000000000
--- a/changelog.d/3963.misc
+++ /dev/null
@@ -1 +0,0 @@
-fix docstring for FederationClient.get_state_for_room
diff --git a/changelog.d/3964.feature b/changelog.d/3964.feature
deleted file mode 100644
index 599222eb589e07f5242bba5ca5cd6e2cd9e126b0..0000000000000000000000000000000000000000
--- a/changelog.d/3964.feature
+++ /dev/null
@@ -1 +0,0 @@
-Remove spurious check which made 'localhost' servers not work
diff --git a/changelog.d/3965.misc b/changelog.d/3965.misc
deleted file mode 100644
index e7e4a9c5a8efacf0248fa2d46ca87c019ec68ec8..0000000000000000000000000000000000000000
--- a/changelog.d/3965.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run notify_app_services as a bg process
diff --git a/changelog.d/3966.misc b/changelog.d/3966.misc
deleted file mode 100644
index 1e3c8e1706ca0974f2f8a3f92cf11a3170616cbb..0000000000000000000000000000000000000000
--- a/changelog.d/3966.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve the logging when handling a federation transaction
\ No newline at end of file
diff --git a/changelog.d/3967.misc b/changelog.d/3967.misc
deleted file mode 100644
index dc808aec731a5dd754eb084aba91172944961d25..0000000000000000000000000000000000000000
--- a/changelog.d/3967.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clarifications in FederationHandler
diff --git a/changelog.d/3968.bugfix b/changelog.d/3968.bugfix
deleted file mode 100644
index 18d43cd64e05fe095802879f6785e015bc6034f6..0000000000000000000000000000000000000000
--- a/changelog.d/3968.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exceptions when processing incoming events over federation
\ No newline at end of file
diff --git a/changelog.d/3970.bugfix b/changelog.d/3970.bugfix
deleted file mode 100644
index 5625315497881417be3d71cf65f39ef419df257d..0000000000000000000000000000000000000000
--- a/changelog.d/3970.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Replaced all occurences of e.message with str(e). Contributed by Schnuffle
diff --git a/changelog.d/3972.misc b/changelog.d/3972.misc
deleted file mode 100644
index e56299ee78b151d1c488f13d9c401a17213a7389..0000000000000000000000000000000000000000
--- a/changelog.d/3972.misc
+++ /dev/null
@@ -1 +0,0 @@
-Further reduce the docker image size
diff --git a/changelog.d/3976.misc b/changelog.d/3976.misc
deleted file mode 100644
index 282148c986cd47b03cdc3d18d37fc7c380007e98..0000000000000000000000000000000000000000
--- a/changelog.d/3976.misc
+++ /dev/null
@@ -1 +0,0 @@
-Build py3 docker images for docker hub too
diff --git a/changelog.d/3980.bugfix b/changelog.d/3980.bugfix
deleted file mode 100644
index 7578414ede72ca5b716725e723510aa6be89f52a..0000000000000000000000000000000000000000
--- a/changelog.d/3980.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some instances of ExpiringCache not expiring cache items
diff --git a/changelog.d/3985.misc b/changelog.d/3985.misc
deleted file mode 100644
index ba935caf3a40b698f610965e9bf7a97481539244..0000000000000000000000000000000000000000
--- a/changelog.d/3985.misc
+++ /dev/null
@@ -1 +0,0 @@
-Updated the installation instructions to point to the matrix-synapse package on PyPI.
diff --git a/changelog.d/3986.bugfix b/changelog.d/3986.bugfix
deleted file mode 100644
index ce74345365ed0bfa03617c170ec85e47ec675eb8..0000000000000000000000000000000000000000
--- a/changelog.d/3986.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix lazy loaded sync in the presence of rejected state events
diff --git a/changelog.d/3987.misc b/changelog.d/3987.misc
deleted file mode 100644
index d6b50162110357a5b3dd7ba8b7357a1ce6b5fd16..0000000000000000000000000000000000000000
--- a/changelog.d/3987.misc
+++ /dev/null
@@ -1 +0,0 @@
-Disable USE_FROZEN_DICTS for unittests by default.
diff --git a/changelog.d/3988.misc b/changelog.d/3988.misc
deleted file mode 100644
index 10379d183bea8c61b64bff46da4c4bc17c597ea1..0000000000000000000000000000000000000000
--- a/changelog.d/3988.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused Jenkins and development related files from the repo.
diff --git a/changelog.d/3989.misc b/changelog.d/3989.misc
deleted file mode 100644
index 26700d168f0151dc628f365a0f2a3b0180f1920f..0000000000000000000000000000000000000000
--- a/changelog.d/3989.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve stacktraces in certain exceptions in the logs
diff --git a/changelog.d/3990.bugfix b/changelog.d/3990.bugfix
deleted file mode 100644
index 51ea105a64f3f08d5bcefba82bbc75089eb39b3a..0000000000000000000000000000000000000000
--- a/changelog.d/3990.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error when logging incomplete HTTP requests
diff --git a/changelog.d/3991.bugfix b/changelog.d/3991.bugfix
deleted file mode 100644
index 6545871f55eba17a2532d3df94aa25200f0083a8..0000000000000000000000000000000000000000
--- a/changelog.d/3991.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add a cache to get_destination_retry_timings