Merge branch 'develop' into sh-cas-auth-via-homeserver

CHANGES.rst

MANIFEST.in

README.rst

jenkins.sh

synapse/__init__.py

synapse/api/constants.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/federation/federation_client.py

synapse/handlers/_base.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/room.py

synapse/handlers/sync.py

synapse/notifier.py

synapse/rest/client/v1/profile.py

synapse/rest/client/v1/room.py

synapse/rest/client/v2_alpha/sync.py

synapse/state.py