Merge branch 'issue/484' into 'develop'

SCRUM#484: Limits sessions to one per user

See merge request !23
2 jobs for develop in 7 minutes and 52 seconds (queued for 8 seconds)