sync with upstream, remove workaround from z_teamcolorname