Merge remote-tracking branch 'origin/master' into kyber-master-feat-cors

.travis.yml

@@ -20,6 +20,12 @@ matrix:
     env: TOXENV=docsroot
   - python: 3.4
     env: TOXENV=docsserver
+  - python: 3.5
+    env: TOXENV=flake8 
+  - python: 3.5 
+    env: TOXENV=docsroot
+  - python: 3.5 
+    env: TOXENV=docsserver
   include:
   - python: 3.4
     addons: 

CHANGELOG.md

@@ -15,6 +15,13 @@ For reference, the possible headings are:
 * **External Contributors** to list contributors outside of BigchainDB GmbH.
 * **Notes**
 
+## [0.9.5] - 2017-03-29
+Tag name: v0.9.5
+
+### Fixed
+Upgrade `python-rapidjson` to `0.0.11`(fixes #1350 - thanks to @ferOnti for
+reporting).
+
 ## [0.9.4] - 2017-03-16
 Tag name: v0.9.4
 

tox.ini

@@ -3,7 +3,7 @@ skipsdist = true
 envlist = py{34,35,36}-{rethinkdb,mongodb}, flake8, docsroot, docsserver
 
 [base]
-basepython = python3.5
+basepython = python3.6
 deps = pip>=9.0.1   
 
 [testenv]