oops: Allow digits in usernames
Merge branch 'develop' into develop-next