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