cosmetics
Merge remote-tracking branch 'origin/master'
things
bugfix: in some cases session was still None when imported with from