Merge branch 'develop' of github.com:matrix-org/synapse into develop

scripts-dev/check_auth.py

scripts-dev/check_event_hash.py

scripts-dev/check_signature.py

scripts-dev/copyrighter-sql.pl

scripts-dev/copyrighter.pl

scripts-dev/database-save.sh

scripts-dev/federation_client.py

scripts-dev/hash_history.py

scripts-dev/make_identicons.pl

scripts-dev/nuke-room-from-db.sh

scripts-dev/sphinx_api_docs.sh

scripts/port_from_sqlite_to_postgres.py

scripts/register_new_matrix_user

scripts/upgrade_db_to_v0.6.0.py

setup.py

synapse/app/homeserver.py

synapse/app/synctl.py

synapse/config/_base.py

synapse/federation/federation_client.py

synapse/federation/persistence.py