Merge branch 'develop' into paul/tiny-fixes

AUTHORS.rst

CHANGES.rst

MANIFEST.in

README.rst

UPGRADE.rst

docs/postgres.rst

jenkins.sh

scripts-dev/definitions.py

scripts/synapse_port_db

synapse/__init__.py

synapse/api/auth.py

synapse/api/filtering.py

synapse/app/homeserver.py

synapse/config/_base.py

synapse/config/cas.py

synapse/config/server.py

synapse/crypto/keyring.py

synapse/events/utils.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py