Updated to version 7.x-2.18
Merge branch 'release/7.x-2.18' into develop