Recreate session when it has been lost
Merge branch 'master' into public_demo_20130402