Merge branch 'master' into develop
Remove the old data files
Merge branch 'develop'