Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup

synapse/handlers/user_directory.py

synapse/notifier.py

synapse/push/pusher.py

synapse/rest/__init__.py

synapse/rest/client/v2_alpha/user_directory.py

synapse/server.py

synapse/state.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/client_ips.py

synapse/storage/events.py

synapse/storage/schema/delta/42/current_state_delta.sql

synapse/storage/schema/delta/42/user_dir.py

synapse/storage/user_directory.py

synapse/types.py

synapse/util/caches/stream_change_cache.py