Merge branch 'master' into stable
Merge branch 'hotfix/2.7.1' into stable
fix crypt
version
Merge branch 'hotfix/2.7.2'