Merge pull request #288 from github/jdennes-auth-token-consistency