Merge branch 'hotfix'
Merge branch 'hotfix'
Merge remote-tracking branch 'origin/develop'
Release: 7.x-1.0
Merge branch 'master' into develop