Merge branch 'master' into develop

CHANGES.rst

-Changes in synapse v0.30.0-rc1 (2018-05-23)
+Changes in synapse v0.30.0 (2018-05-24)
 ==========================================
 
-This version includes support for Privacy Notice agreement collection. More
-details live at docs/privacy_policy_templates/README.md
+'Server Notices' are a new feature introduced in Synapse 0.30. They provide a
+channel whereby server administrators can send messages to users on the server.
+
+They are used as part of communication of the server policies (see ``docs/consent_tracking.md``),
+however the intention is that they may also find a use for features such
+as "Message of the day".
+
+This feature is specific to Synapse, but uses standard Matrix communication mechanisms,
+so should work with any Matrix client. For more details see ``docs/server_notices.md``
+
+Further Server Notices/Consent Tracking Support:
+
+* Allow overriding the server_notices user's avatar (PR #3273)
+* Use the localpart in the consent uri (PR #3272)
+* Support for putting %(consent_uri)s in messages (PR #3271)
+* Block attempts to send server notices to remote users (PR #3270)
+* Docs on consent bits (PR #3268)
 
 
-GDPR Support:
+
+Changes in synapse v0.30.0-rc1 (2018-05-23)
+==========================================
+
+Server Notices/Consent Tracking Support:
 
 * ConsentResource to gather policy consent from users (PR #3213)
 * Move RoomCreationHandler out of synapse.handlers.Handlers (PR #3225)

synapse/__init__.py

@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.30.0-rc1"
+__version__ = "0.30.0"