Merge remote branch 'origin/1.0-beta-7' into 1.0-beta-7