Merge branch 'develop' into pushers

.gitignore

synapse/api/auth.py

synapse/api/urls.py

synapse/app/homeserver.py

synapse/events/utils.py

synapse/handlers/_base.py

synapse/handlers/directory.py

synapse/handlers/events.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/profile.py

synapse/handlers/room.py

synapse/handlers/typing.py

synapse/http/servlet.py

synapse/python_dependencies.py

synapse/rest/client/v1/__init__.py

synapse/rest/client/v1/admin.py

synapse/rest/client/v1/base.py

synapse/rest/client/v1/directory.py