Bumped version for release of 1.8.5
Merge branch 'release/1.8.5' into develop
Bumped version for development after release.