Merge pull request #302 from matrix-org/daniel/3pidinvites

synapse/api/auth.py

synapse/api/constants.py

synapse/federation/federation_client.py

synapse/federation/federation_server.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/_base.py

synapse/handlers/federation.py

synapse/handlers/room.py

synapse/http/client.py

synapse/rest/client/v1/room.py

synapse/util/third_party_invites.py