Merge branch 'develop' into storage_transactions

cmdclient/console.py

synapse/api/auth.py

synapse/api/constants.py

synapse/api/events/room.py

synapse/handlers/__init__.py

synapse/handlers/events.py

synapse/handlers/room.py

synapse/rest/events.py

synapse/rest/initial_sync.py

synapse/rest/room.py

synapse/server.py

synapse/storage/__init__.py

synapse/storage/feedback.py

tests/rest/test_events.py

tests/rest/test_rooms.py

tests/rest/utils.py

webclient/components/matrix/matrix-service.js