Merge branch 'develop' into develop

.github/ISSUE_TEMPLATE.md

MANIFEST.in

UPGRADE.rst

contrib/prometheus/README

contrib/prometheus/consoles/synapse.html

contrib/prometheus/synapse.rules

docs/postgres.rst

jenkins-dendron-haproxy-postgres.sh

jenkins-dendron-postgres.sh

jenkins-postgres.sh

jenkins-sqlite.sh

scripts-dev/federation_client.py

synapse/api/auth.py

synapse/app/_base.py

synapse/app/appservice.py

synapse/app/client_reader.py

synapse/app/federation_reader.py

synapse/app/federation_sender.py

synapse/app/frontend_proxy.py

synapse/app/homeserver.py