Revert earlier commit for HTML entities in team names; just use UTF characters
Eliminate warning
Merge remote-tracking branch 'upstream/master'