version & changelog
Merge branch 'release/2.18' into develop