Delete credentials.dat
Merge branch 'master' into develop