base

Merge change I60ff11dc into eclair

* changes:
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange