Merge branch 'release/7.x-0.12' into develop
test is GREEN .. at least on localhost
updated to version 7.x-0.13
Merge branch 'release/7.x-0.13'