Merge branch 'master' into develop

.github/ISSUE_TEMPLATE.md

CHANGES.md

synapse/__init__.py

synapse/config/server.py

synapse/federation/federation_server.py

synapse/handlers/events.py

synapse/handlers/federation.py

synapse/rest/client/v1/events.py

synapse/rest/client/v1/room.py

synapse/storage/event_federation.py

synapse/storage/events_worker.py