diff --git a/requirements/common.txt b/requirements/common.txt
index 4a7281cbbf..4863f60b65 100644
--- a/requirements/common.txt
+++ b/requirements/common.txt
@@ -1,6 +1,6 @@
 -r ipython.txt
 # Django itself; we use a slightly patched version
-git+https://github.com/zulip/truncated-django-1.8.15.git@cbf4fa3aef1b17f37d75a70e57f9b69a0f99ed5c#egg=Django==1.8.15
+Django==1.10.4
 
 # Needed for rendering backend templates
 Jinja2==2.8
diff --git a/tools/travis/success-http-headers.txt b/tools/travis/success-http-headers.txt
index 384bd8d46b..bbf80b4fa2 100644
--- a/tools/travis/success-http-headers.txt
+++ b/tools/travis/success-http-headers.txt
@@ -1,23 +1,23 @@
   Self-signed certificate encountered.
 WARNING: no certificate subject alternative name matches
 	requested host name ‘localhost’.
-  HTTP/1.1 302 FOUND
+  HTTP/1.1 302 Found
   Server: nginx/1.4.6 (Ubuntu)
   Content-Type: text/html; charset=utf-8
   Transfer-Encoding: chunked
   Connection: keep-alive
-  Location: https://localhost/login
+  Location: /login
   Strict-Transport-Security: max-age=15768000
-Location: https://localhost/login [following]
+Location: /login [following]
 Reusing existing connection to localhost:443.
-  HTTP/1.1 301 MOVED PERMANENTLY
+  HTTP/1.1 301 Moved Permanently
   Server: nginx/1.4.6 (Ubuntu)
   Content-Type: text/html; charset=utf-8
   Transfer-Encoding: chunked
   Connection: keep-alive
-  Location: https://localhost/login/
+  Location: /login/
   Strict-Transport-Security: max-age=15768000
-Location: https://localhost/login/ [following]
+Location: /login/ [following]
 Reusing existing connection to localhost:443.
   HTTP/1.1 200 OK
   Server: nginx/1.4.6 (Ubuntu)
diff --git a/version.py b/version.py
index 736895fbc8..6bdfedfb56 100644
--- a/version.py
+++ b/version.py
@@ -1,2 +1,2 @@
 ZULIP_VERSION = "1.4.1+git"
-PROVISION_VERSION = '2.5'
+PROVISION_VERSION = '3.0'