Merge pull request #546 from curveball/developer-tokens-get-client-id

Merge pull request #546 from curveball/developer-tokens-get-client-id #855