Simplified session handling to fix problems encountered in express 4.x
manual merge
Merge branch 'the-t-in-rtf-ecu-22'