Version 0.6.1-SNAPSHOT
Migrate backs up dir first
Merge branch 'develop'
Version 0.6.1