Merge branch 'hotfix' into develop
Changed package to easyDDB.
Merge branch 'develop'