Version bump.
Merge branch 'release/v0.8.5' into develop