Token is not renewed when expired
Merge branch 'bug-762' into devel
Merge branch 'devel'