Merge branch 'master' into develop
Cleanup dependencies.
Merge branch 'hotfix'