Merge branch 'release/7.x-0.20' into develop
bug 1134 password in ie 8
Tagging version 7.x-0.21
Merge branch 'release/7.x-0.21'