version 7.x-0.12
Merge branch 'release/7.x-0.12' into develop