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