Merge branch 'james-dev' into 'master'

Fix for user level detection

See merge request !16
4 jobs for master in 57 minutes and 25 seconds (queued for 1 second)