Merge branch 'release/0.11.0' into develop
Doc fix
Merge branch 'develop'
Merge branch 'master' into cordova