Merge branch 'release-7.x-1.0alpha2'
Merge branch 'master' into develop