session handling for console
Merge remote-tracking branch 'upstream/gh-pages'