Preparing new release: 0.18.0
Merge branch 'releases/0.18'
Merge branch 'master' into develop