Merge branch 'master' into develop

2 files changed, 3 insertions, 3 deletions

diff --git a/synapse/__init__.py b/synapse/__init__.py

index 04200060bf..b45cf47b56 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py

index a6ebe23567..6c1fdcb853 100644
--- a/synapse/http/endpoint.py
+++ b/synapse/http/endpoint.py
@@ -50,11 +50,11 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None,
 
     if ssl_context_factory is None:
         transport_endpoint = TCP4ClientEndpoint
-        default_port = 8080
+        default_port = 8008
     else:
         transport_endpoint = SSL4ClientEndpoint
         endpoint_kw_args.update(sslContextFactory=ssl_context_factory)
-        default_port = 443
+        default_port = 8448
 
     if port is None:
         return SRVClientEndpoint(