Merge branch 'master' into develop
Remove data directory
Merge branch 'develop' into release-1.2