0.8.5
Merge branch 'release/0.8.5' into develop