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

.gitignore

CHANGES.rst

UPGRADE.rst

docs/turn-howto.rst

static/client/register/index.html

static/client/register/js/jquery-2.1.3.min.js

static/client/register/js/recaptcha_ajax.js

static/client/register/js/register.js

static/client/register/register_config.sample.js

static/client/register/style.css

synapse/api/urls.py

synapse/app/homeserver.py

synapse/config/ratelimiting.py

synapse/config/server.py

synapse/config/voip.py

synapse/federation/federation_server.py

synapse/federation/transport/__init__.py

synapse/federation/transport/server.py

synapse/handlers/directory.py

synapse/handlers/events.py