sync with upstream, remove workaround in z_teamcolorname