auth_tokens are stored in a separated file.
Merge remote-tracking branch 'origin/master'