Merge "allow + in usernames"