Merge branch 'master' into 'beta'

Allow student IDs > 6 digits to beta

See merge request !103
3 jobs for beta in 2 minutes and 59 seconds (queued for 5 seconds)