Merge branch 'release/0.8.5' into develop
Turns out unittest2 is a backport from py2.7, not from py3.x.
0.8.6
Merge branch 'release/0.8.6'