Version 7.x-1.0
Merge branch 'release/7.x-1.0' into develop