Merge branch 'release/7.x-0.20' into develop
update feature html_5_text_format
updated to version 7.x-0.21
Merge branch 'release/7.x-0.21'