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

synapse/api/events/__init__.py

synapse/app/homeserver.py

synapse/server.py

synapse/storage/__init__.py

synapse/storage/_base.py

synapse/storage/pdu.py

synapse/storage/registration.py

synapse/storage/room.py

synapse/storage/roommember.py

synapse/storage/stream.py

synapse/storage/transactions.py

tests/handlers/test_directory.py

tests/handlers/test_presence.py

tests/handlers/test_profile.py

tests/storage/TESTS_NEEDED_FOR

tests/storage/test_directory.py

tests/storage/test_presence.py

tests/storage/test_profile.py

tests/storage/test_registration.py

tests/storage/test_room.py