Merge branch 'username-underscores' into 'develop'

Allow underscores/dashes in usernames.

Closes #429

See merge request !537
2 jobs for develop in 5 minutes (queued for 1 minute and 45 seconds)