Merge branch 'develop' into daniel/ick

MANIFEST.in

jenkins-flake8.sh

jenkins-postgres.sh

jenkins-sqlite.sh

jenkins-unittests.sh

synapse/api/auth.py

synapse/app/homeserver.py

synapse/app/synctl.py

synapse/config/__main__.py

synapse/config/_base.py

synapse/config/api.py

synapse/config/homeserver.py

synapse/federation/federation_client.py

synapse/federation/transport/client.py

synapse/handlers/_base.py

synapse/handlers/auth.py

synapse/handlers/directory.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/profile.py