Merge remote-tracking branch 'origin/master'

synapse/app/homeserver.py

synapse/federation/__init__.py

synapse/http/server.py

synapse/rest/__init__.py

synapse/rest/base.py

synapse/rest/webclient.py

synapse/server.py

tests/federation/test_federation.py

tests/handlers/test_directory.py

tests/handlers/test_federation.py

tests/handlers/test_presence.py

tests/handlers/test_presencelike.py

tests/handlers/test_profile.py

tests/handlers/test_room.py

tests/rest/test_presence.py

tests/rest/test_profile.py