Merge branch 'unscoped_token_bug' of https://github.com/henriquetruta/keystone into unscoped_token_bug
Merge branch 'unscoped_token_bug' of https://github.com/henriquetruta/keystone into unscoped_token_bug