Merge branch 'master' into develop
version 1.1.0 package xml
Merge branch 'develop'