Merge branch 'develop' into daniel/3pidinvites

demo/start.sh

synapse/api/filtering.py

synapse/app/homeserver.py

synapse/config/logger.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/sync.py

synapse/rest/client/v2_alpha/sync.py

synapse/storage/__init__.py

synapse/storage/engines/postgres.py

synapse/storage/engines/sqlite3.py

synapse/storage/prepare_database.py

synapse/storage/roommember.py

synapse/storage/state.py

synapse/util/debug.py

tests/api/test_filtering.py

tests/utils.py