updated to version 7.x-1.12
Merge branch 'release/7.x-1.12' into develop