Merge branch 'release/7.x-1.11' into develop
feature/1378_my_page_help
updated to version 7.x-1.12
Merge branch 'release/7.x-1.12'