Merge branch 'routes' into testmerge
Fixes phantom session users
Merge branch 'master' into testmerge
solves merge conflicts