Merge branch 'develop' into markjh/edu_frequency

README.rst

synapse/api/filtering.py

synapse/events/utils.py

synapse/federation/transport/server.py

synapse/handlers/account_data.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/search.py

synapse/handlers/sync.py

synapse/http/server.py

synapse/http/servlet.py

synapse/rest/client/v1/admin.py

synapse/rest/client/v1/base.py

synapse/rest/client/v1/directory.py

synapse/rest/client/v1/events.py

synapse/rest/client/v1/initial_sync.py

synapse/rest/client/v1/login.py

synapse/rest/client/v1/presence.py

synapse/rest/client/v1/profile.py

synapse/rest/client/v1/push_rule.py