first steps towards successful session handling.  Shouldn't break anything.  Isn't fully successful though.
Merge branch 'master' of https://github.com/makinj/MeNext into HEAD