Merge branch 'master' into develop
correcting sharing bug... again...
Merge branch 'develop'