v4.11-9506-beta
Merge branch 'master' into ubuntu/BETA