Merge pull request #1049 from matrix-org/erikj/presence_users_in_room

synapse/federation/federation_client.py

synapse/handlers/directory.py

synapse/handlers/events.py

synapse/handlers/presence.py

synapse/handlers/receipts.py

synapse/handlers/sync.py

synapse/handlers/typing.py

synapse/push/bulk_push_rule_evaluator.py

synapse/replication/slave/storage/events.py

synapse/state.py

synapse/storage/events.py

synapse/storage/roommember.py

tests/handlers/test_typing.py

tests/storage/test_roommember.py