Fix a typo in the secret token file.
Merge branch 'master' into travis-setup