diff --git a/CHANGELOG.md b/CHANGELOG.md
index 053e7ded22a..54ea35d8715 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,28 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.1.0] - ???
+## [3.1.0] - 2018-07-20
+
+### JupyterLab plotlywidget version: 0.2.0
+Please upgrade the Jupyterlab `plotlywidget` extension to version 0.2.0
+(See README for instructions)
 
 ### Plotly.js version: 1.39.2
+See [Plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md) for
+full list of changes. Select highlights are listed below. 
+
+### Added
+ - Added 3D streamtube traces
+   [plotly/plotly.js#2658](https://github.com/plotly/plotly.js/pull/2658)
+ - Added support for on-graph text in scattergl traces
+ - Added gridshape attribute to polar subplots with values 'circular' (the default) and 'linear' (to draw polygon grids)
+   [plotly/plotly.js#2739](https://github.com/plotly/plotly.js/pull/2739)
 
 ## [3.0.2] - 2018-07-17
 This is a minor bug-fix release to 3.0.0
 
+### JupyterLab plotlywidget version: 0.1.1
+
 ### Plotly.js version: 1.38.3
 
 ### Fixed
@@ -26,6 +41,8 @@ Note: This release's installation was broken. It has been removed from PyPI
 
 This is a major version with many exciting updates. See the [Introducing plotly.py 3.0.0](https://medium.com/@plotlygraphs/introducing-plotly-py-3-0-0-7bb1333f69c6) post for more information.
 
+### JupyterLab plotlywidget version: 0.1.1
+
 ### Plotly.js version: 1.38.3
 
 ### Added
diff --git a/README.md b/README.md
index c2b3d2e631d..8968667df6b 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,10 @@ jupyter nbextension enable --py plotlywidget --sys-prefix
 In addition, to add JupyterLab support run the following commands
 
 ```
-pip install jupyterlab
+pip install jupyterlab==0.32.1
 export NODE_OPTIONS=--max-old-space-size=4096
-jupyter labextension install @jupyter-widgets/jupyterlab-manager # install the Jupyter widgets extension
-jupyter labextension install plotlywidget
+jupyter labextension install @jupyter-widgets/jupyterlab-manager@0.35 # install the Jupyter widgets extension
+jupyter labextension install plotlywidget@0.2
 ```
 
 If you're migrating from plotly.py version 2, please check out the [migration guid](migration-guide.md)
diff --git a/circle.yml b/circle.yml
index 4581301872c..4b2eef72833 100644
--- a/circle.yml
+++ b/circle.yml
@@ -21,14 +21,16 @@ dependencies:
     # install everything tox knows about and the plotly package.
     - pip install tox
     - tox --notest:
-      timeout: 1200
+        timeout: 1200
+
     - pip install -I .
 
     # we need to cd out of the project root to ensure the install worked
     - cd ~ && python -c "import plotly"
 
     # install jupyter test JS requirements
-    - cd ${PLOTLY_JUPYTER_TEST_DIR} && npm i
+    - cd ${PLOTLY_JUPYTER_TEST_DIR} && npm i:
+        timeout: 1200
 
   cache_directories:
 
diff --git a/js/package.json b/js/package.json
index 60f2b317480..5de767bfb3e 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plotlywidget",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "The plotly.py ipywidgets library",
   "author": "The plotly.py team",
   "license": "MIT",
diff --git a/plotly/api/v2/utils.py b/plotly/api/v2/utils.py
index a8222929ab8..cbd1efaa8b1 100644
--- a/plotly/api/v2/utils.py
+++ b/plotly/api/v2/utils.py
@@ -112,7 +112,7 @@ def get_headers():
 
 
 @retry(wait_random_min=100, wait_random_max=1000, wait_exponential_max=10000,
-       stop_max_delay=90000)
+       stop_max_delay=120000)
 def request(method, url, **kwargs):
     """
     Central place to make any api v2 api request.
diff --git a/plotly/version.py b/plotly/version.py
index 5d2018deb69..978d8521ccf 100644
--- a/plotly/version.py
+++ b/plotly/version.py
@@ -1,5 +1,5 @@
-__version__ = '3.1.0a1'
-__frontend_version__ = '^0.1.1'
+__version__ = '3.1.0'
+__frontend_version__ = '^0.2.0'
 
 
 def stable_semver():