Merge branch 'develop' into paul/tiny-fixes

CHANGES.rst

MANIFEST.in

README.rst

synapse/__init__.py

synapse/api/auth.py

synapse/api/constants.py

synapse/api/errors.py

synapse/api/filtering.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/config/registration.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transaction_queue.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/_base.py

synapse/handlers/auth.py

synapse/handlers/events.py

synapse/handlers/federation.py