Fix token refresh
Merge remote branch 'origin/master'