Extend session to 1d
Merge branch 'master' into live