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