Version 0.8.6
Merge branch 'develop'