Merge branch 'develop' into server2server_signing

CHANGES.rst

VERSION

docs/client-server/swagger_matrix/api-docs-rooms

docs/freenode.txt

docs/specification.rst

docs/turn-howto.rst

synapse/__init__.py

synapse/api/auth.py

synapse/api/events/__init__.py

synapse/api/events/factory.py

synapse/api/events/room.py

synapse/api/events/utils.py

synapse/config/captcha.py

synapse/config/homeserver.py

synapse/config/repository.py

synapse/config/voip.py

synapse/handlers/__init__.py

synapse/handlers/admin.py

synapse/handlers/directory.py

synapse/handlers/federation.py