Merge branch 'release-0.18.0' into develop

* release-0.18.0:
  Bumping version to 0.18.0