Merge branch 'development'
Release: 7.x-1.0
Merge branch 'master' into development