fix session page
Merge origin/master