Merge "User: Don't fail mysteriously when passing a User object to idFromName()"