Fixing token refresh intent
Merge pull request #604 from bhariharan/master

Fixing token refresh intent
Merge branch 'master' into unstable
Merge pull request #605 from bhariharan/unstable

Merge 'master' to unstable