Merge remote-tracking branch 'origin/develop' into markjh/3pid

synapse/api/filtering.py

synapse/handlers/message.py

synapse/handlers/sync.py

synapse/storage/account_data.py

synapse/storage/events.py

synapse/storage/filtering.py

synapse/storage/receipts.py

synapse/storage/schema/delta/28/events_room_stream.sql

synapse/storage/stream.py

synapse/storage/tags.py

synapse/util/caches/lrucache.py

synapse/util/caches/stream_change_cache.py

synapse/util/caches/treecache.py

tests/api/test_filtering.py

tests/rest/client/v1/test_rooms.py

tests/util/test_lrucache.py

tests/util/test_treecache.py