Merge branch 'develop' into paul/tiny-fixes

CHANGES.rst

demo/start.sh

synapse/__init__.py

synapse/api/auth.py

synapse/api/errors.py

synapse/api/filtering.py

synapse/appservice/scheduler.py

synapse/config/cas.py

synapse/config/homeserver.py

synapse/config/password.py

synapse/config/saml2.py

synapse/events/utils.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/__init__.py

synapse/handlers/federation.py

synapse/handlers/receipts.py

synapse/handlers/room.py