Post merge updates

Signed-off-by: Łukasz Gryglicki <[email protected]>

Author: lukaszgryglicki

company_developers1.txt

@@ -7452,11 +7452,6 @@ Atlas SoftWeb:
 AtlasHost:
 	Nowaker: Nowaker!users.noreply.github.com, nowaker!virtkick.com, spam!nowaker.net from 2014-10-01 until 2015-01-01
 Atlassian:
-	aphistic: aphistic!users.noreply.github.com from 2020-06-01
-	belak: belak!coded.io, belak!users.noreply.github.com, isirinz!naver.com, kaleb!coded.io until 2017-04-01
-	jamesmoessis: james.moessis1!gmail.com, jamesmoessis!users.noreply.github.com, jmoessis!atlassian.com from 2021-01-18
-	seanmarpo: seanmarpo!users.noreply.github.com from 2020-05-01
-Atlassian Inc:
 	CameronLonsdale: Cameron.Lonsdale!gmail.com, CameronLonsdale!users.noreply.github.com from 2019-07-01
 	ColinHebert: chebert!atlassian.com, hebert.colin!gmail.com
 	DarkPurple141: alex.hinds141!gmail.com
@@ -7466,11 +7461,13 @@ Atlassian Inc:
 	Tenaria: cfei!atlassian.com, claire.jfei!gmail.com
 	agelastic: vitaly.osipov!gmail.com until 2015-02-01
 	anshumanbh: anshumanbh!users.noreply.github.com from 2019-06-01
+	aphistic: aphistic!users.noreply.github.com from 2020-06-01
 	artkoshelev: akoshelev!atlassian.com, art.koshelev!gmail.com, artkoshelev!users.noreply.github.com
 	ash2k: 126021+ash2k!users.noreply.github.com, ash2k!users.noreply.github.com, ash2kk!gmail.com, mmazurskiy!atlassian.com from 2014-08-01
 	awprice: aprice!atlassian.com, awprice!users.noreply.github.com
 	beanliu: bean.liu89!gmail.com, xliu2!atlassian.com
 	bedwards: bedwards!atlassian.com
+	belak: belak!coded.io, belak!users.noreply.github.com, isirinz!naver.com, kaleb!coded.io until 2017-04-01
 	benbarclay: benbarclay!gmail.com, benbarclay!users.noreply.github.com
 	cetanu: vsyrakis!atlassian.com
 	cewood: cewood!users.noreply.github.com from 2015-05-01 until 2016-08-01
@@ -7485,6 +7482,7 @@ Atlassian Inc:
 	hstan: tanhanshuo!gmail.com
 	incu6us: vyacheslavpryimak!gmail.com from 2017-04-01 until 2017-06-01
 	irisgve: iendozo!atlassian.com, iris.endozo!gmail.com
+	jamesmoessis: james.moessis1!gmail.com, jamesmoessis!users.noreply.github.com, jmoessis!atlassian.com from 2021-01-18
 	jamiebuilds: jamiebuilds!users.noreply.github.com, me!thejameskyle.com from 2018-01-01 until 2018-10-01
 	jaygurnani: jaygurnani!users.noreply.github.com from 2020-04-01
 	jcmackie: jc.mackie!gmail.com
@@ -7520,6 +7518,7 @@ Atlassian Inc:
 	roganartu: github!roganartu.com, roganartu!users.noreply.github.com, thoeni!gmail.com, turadg!quizlet.com from 2016-01-01 until 2017-10-01
 	s50600822: s50600822!gmail.com, s50600822!users.noreply.github.com from 2015-11-01 until 2018-11-01
 	samm02: samm02!gmail.com, spushparatnam!atlassian.com
+	seanmarpo: seanmarpo!users.noreply.github.com from 2020-05-01
 	soneymathew: soneymathew!users.noreply.github.com
 	srijs: srijs!airpost.net, srijs!users.noreply.github.com
 	thundergolfer: jonathon.i.belotti!gmail.com, thundergolfer!users.noreply.github.com from 2017-11-01 until 2018-02-01
@@ -16204,6 +16203,7 @@ Cisco:
 	kmalempa: kmalempa!cisco.com
 	kontar: takondra!cisco.com, taras!ti.com, taras.kondratiuk!linaro.org
 	kowshikRoy: repon.roy!hotmail.com
+	kpratyus: kpratyus!cisco.com, kpratyus!users.noreply.github.com from 2021-07-14
 	krish512: krish512!users.noreply.github.com from 2015-06-01 until 2016-07-01
 	krishnadurai: krishna.durai!outlook.com, krishnadurai!users.noreply.github.com
 	krmayankk: krmayankk!users.noreply.github.com, mayank.kumar!salesforce.com until 2015-10-01
@@ -16316,6 +16316,7 @@ Cisco:
 	sabithag: sabitha.george!gmail.com
 	sachinmsft: sachinmsft!users.noreply.github.com until 2015-04-01
 	sadasu: sdasu!redhat.com until 2018-12-01
+	samimusallam: sami.musallam7!gmail.com, samusall!cisco.com from 2022-01-31
 	sanjaylca: sanjayl!kymasys.com from 2015-02-01 until 2017-06-01
 	sanketmehta28: sanketmehta28!gmail.com, sanketmehta28!users.noreply.github.com, sankmeht!cisco.com from 2020-12-01
 	sarat-k: sarat-k!users.noreply.github.com, saratk!gmail.com
@@ -16558,5 +16559,3 @@ City Culture Co. Ltd.:
 	GnawNom: joewang!berkeley.edu from 2014-02-01 until 2015-06-01
 	j03wang: joewang!berkeley.edu from 2014-02-01 until 2015-06-01
 	joe11051105: joe11051105!users.noreply.github.com, joewang!berkeley.edu, wangjoe1105!gmail.com from 2014-02-01 until 2015-06-01
-City Index:
-	anton-chuhunou: anton-chuhunou!users.noreply.github.com from 2015-04-01 until 2017-03-01

company_developers2.txt

@@ -1,6 +1,8 @@
 # This file is derived from developers_affiliations.txt and so should not be edited directly.
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
+City Index:
+	anton-chuhunou: anton-chuhunou!users.noreply.github.com from 2015-04-01 until 2017-03-01
 City National Bank:
 	bankershours: bankershours!users.noreply.github.com from 2020-01-01
 	holynakamoto: holynakamoto!users.noreply.github.com from 2020-01-01
@@ -6439,6 +6441,8 @@ Diabol AB:
 	ttauveron: ttauveron!users.noreply.github.com from 2019-10-01
 Diabolocom:
 	vbatoufflet: vbatoufflet!users.noreply.github.com, vincent!batoufflet.info from 2014-07-01 until 2016-04-01
+Diagrid:
+	yaron2: schneider.yaron!live.com, yaron2!users.noreply.github.com, yaronsc!microsoft.com from 2021-11-01
 Dialog:
 	Afshin-Ofx: Afshin-Ofx!users.noreply.github.com until 2014-07-01
 Dialog Axiata PLC:

company_developers3.txt

@@ -879,7 +879,6 @@ Google LLC:
 	evankanderson: argent!google.com, evan.k.anderson!gmail.com, evankanderson!users.noreply.github.com until 2019-12-15
 	evgenii-petrov-arrival: evgenii-petrov-arrival!users.noreply.github.com until 2019-07-01
 	evmar: evan.martin!gmail.com, evmar!users.noreply.github.com, martine!danga.com, mw!symfiotic.com from 2019-04-01
-	evverx: evvers!ya.ru, evverx!users.noreply.github.com
 	ewiseblatt: ewiseblatt!google.com
 	eytankidron: eytankidron!google.com, eytankidron!users.noreply.github.com
 	ezimanyi: ezimanyi!google.com, ezimanyi!users.noreply.github.com from 2018-01-01
@@ -5720,6 +5719,7 @@ Huawei Technologies Co. Ltd:
 	FengtuWang: FengtuWang!users.noreply.github.com, wangfengtu!huawei.com
 	FourSpaces: FourSpaces!users.noreply.github.com, cheng1483x!gmail.com, wangzefeng!huawei.com
 	GauravAgrawal-Huawei: gaurav.agrawal!huawei.com
+	GitHubxsy: GitHubxsy!users.noreply.github.com, xieshiyi1!huawei.com
 	GraysonWu: GraysonWu!users.noreply.github.com, wgrayson!vmware.com from 2017-07-01 until 2017-09-01
 	HW-lj: liujie165!huawei.com
 	HaiyangDING: HaiyangDING!users.noreply.github.com, dinghaiyang!huawei.com, haiyang.ding!gmail.com until 2017-09-01
@@ -5750,6 +5750,7 @@ Huawei Technologies Co. Ltd:
 	Seshu-Kumar-M: seshu.kumar.m!huawei.com
 	Shankara-Huawei: shankara!huawei.com
 	Shashikanth-Huawei: shashikanth.vh!huawei.com
+	Shelley-BaoYue: Shelley-BaoYue!users.noreply.github.com, baoyue2!huawei.com
 	ShengYong: shengyong!users.noreply.github.com, shengyong2021!gmail.com until 2021-07-09
 	ShubhamM-15: ShubhamM-15!users.noreply.github.com, shubham.mathur!huawei.com
 	SrinivasChilveri: SrinivasChilveri!users.noreply.github.com, srinivasch.ch!huawei.com
@@ -5763,6 +5764,7 @@ Huawei Technologies Co. Ltd:
 	WangNan0: wangnan0!huawei.com
 	Wangzihao18: Wangzihao18!users.noreply.github.com
 	WeiZhang555: WeiZhang555!users.noreply.github.com, marijuss!wix.com, weizhang555.zw!gmail.com, zhangwei555!huawei.com, zhangwei_cs!qq.com
+	XiShanYongYe-Chang: XiShanYongYe-Chang!users.noreply.github.com, changzhen5!huawei.com, xishanyongye!126.com
 	YANGYongqiang: xiaoqiangnk!gmail.com
 	YYGCui: YYGCui!users.noreply.github.com
 	YaoZengzeng: 461941420!qq.com, yaozengzeng!foxmail.com, yaozengzeng!huawei.com, yaozengzeng!zju.edu.cn, zengzengyao!harmonycloud.cn

company_developers4.txt

@@ -1733,6 +1733,7 @@ Independent:
 	TimothyGu: TimothyGu!users.noreply.github.com, timothygu99!gmail.com until 2015-08-01
 	Tinabr7: ruchandani.tina!gmail.com until 2016-12-01
 	TisonKun: TisonKun!users.noreply.github.com, wander4096!gmail.com until 2018-05-01
+	TomRoSystems: 8647888+TomRoSystems!users.noreply.github.com, trojek!splunk.com from 2022-02-01
 	TommyCpp: TommyCpp!users.noreply.github.com, zhongyang.wu!outlook.com
 	TomorJM: TomorJM!users.noreply.github.com until 2020-03-01
 	Tony1023: Tony1023!users.noreply.github.com, tony1023lv!gmail.com until 2018-05-01, from 2018-07-01 until 2019-06-01, from 2019-08-01
@@ -6080,6 +6081,7 @@ Independent:
 	kpdecker: kpdecker!gmail.com, kpdecker!users.noreply.github.com from 2015-04-01 until 2015-08-01
 	kplimack: jake.plimack!gmail.com, kplimack!users.noreply.github.com, sobreiro.pedro!gmail.com until 2015-06-01
 	kpr6: kpr6!users.noreply.github.com, pranaykarnati006!gmail.com until 2016-06-01
+	kpratyus: kpratyus!cisco.com, kpratyus!users.noreply.github.com until 2021-07-14
 	kpucynski: kpucynski!users.noreply.github.com from 2020-02-01
 	kraai: kraai!ftbfs.org, kraai!users.noreply.github.com from 2016-04-01 until 2016-05-01, from 2018-05-01
 	kradalby: kradalby!kradalby.no from 2014-08-01 until 2017-09-01
@@ -8355,6 +8357,7 @@ Independent:
 	sameerkhan2k1: sameerkhan2k!gmail.com
 	samertm: samer!samertm.com, samertm!users.noreply.github.com until 2014-08-01, from 2015-05-01 until 2015-09-01
 	samgranieri: sam!samgranieri.com, samgranieri!users.noreply.github.com until 2015-06-01
+	samimusallam: sami.musallam7!gmail.com, samusall!cisco.com until 2019-09-09
 	samip5: samip5!users.noreply.github.com until 2019-03-01, from 2019-05-01 until 2020-06-01
 	samjo-nyang: samjo-nyang!users.noreply.github.com until 2016-02-01
 	samjsong: samjsong!users.noreply.github.com, ssong!sumologic.com until 2016-06-01, from 2016-08-01 until 2017-06-01, from 2017-08-01 until 2018-07-01
@@ -11034,6 +11037,3 @@ InsideView:
 	zorro786: zorro786!users.noreply.github.com until 2014-12-01
 InsideWarehouse:
 	dominykas: dominykas!users.noreply.github.com until 2017-02-01
-Insiders:
-	TrustNoOne: TrustNoOne!users.noreply.github.com from 2014-11-01 until 2015-03-01
-	yoshz: yosh!elzorro.nl, yoshz!users.noreply.github.com until 2016-01-01

company_developers5.txt

@@ -1,6 +1,9 @@
 # This file is derived from developers_affiliations.txt and so should not be edited directly.
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
+Insiders:
+	TrustNoOne: TrustNoOne!users.noreply.github.com from 2014-11-01 until 2015-03-01
+	yoshz: yosh!elzorro.nl, yoshz!users.noreply.github.com until 2016-01-01
 Insight:
 	ChiefInnovator: ChiefInnovator!users.noreply.github.com from 2015-09-01 until 2015-11-01
 	MuhammadZeeshan34: 13mscsmnawaz!seecs.edu.pk, MuhammadZeeshan34!users.noreply.github.com from 2017-04-01 until 2019-07-01
@@ -801,7 +804,7 @@ Intel Corporation:
 	egrumbach: emmanuel.grumbach!intel.com
 	ejpenney: ejpenney!users.noreply.github.com, emory.j.penney!intel.com, treadstoneit!gmail.com
 	ekalugin: ekalugin!users.noreply.github.com, evgeny.kalugin!intel.com
-	electrocucaracha: chipahuac!hotmail.com, electrocucaracha!users.noreply.github.com, madhusanka.thilina!gmail.com, victor.morales!intel.com
+	electrocucaracha: chipahuac!hotmail.com, electrocucaracha!gmail.com, electrocucaracha!users.noreply.github.com, v.morales!samsung.com, victor.morales!intel.com until 2020-03-31
 	eli-osherovich: eli.osherovich!gmail.com until 2014-07-01
 	elizabethbain: elizabeth.bain3!gmail.com from 2014-08-01 until 2016-06-01
 	elsonrodriguez: elson.o.rodriguez!intel.com, elson.rodriguez!gmail.com, elsonrodriguez!users.noreply.github.com from 2016-02-01
@@ -7590,7 +7593,7 @@ Lightbend Inc:
 	raboof: arnout!bzzt.net, arnouten!bzzt.net, github!bzzt.net, raboof!users.noreply.github.com from 2017-03-01
 	retronym: jzaugg!gmail.com, retronym!users.noreply.github.com
 	seglo: sean!seanglover.com, seglo!randonom.com, seglo!users.noreply.github.com from 2015-11-01
-	skonto: skonto!users.noreply.github.com from 2015-09-01
+	skonto: skonto!users.noreply.github.com, skontopo!redhat.com, st.kontopoulos!gmail.com from 2015-09-01 until 2020-06-01
 	steinybot: jasonpickensnz!gmail.com from 2019-09-01 until 2020-04-01
 	szeiger: szeiger!novocode.com, szeiger!users.noreply.github.com
 	viktorklang: viktor.klang!gmail.com, viktorklang!users.noreply.github.com
@@ -13276,7 +13279,7 @@ Microsoft Corporation:
 	yanivoliver: yanivoliver!gmail.com, yanivoliver!users.noreply.github.com until 2014-11-01, from 2016-04-01
 	yantang-msft: yantang-msft!users.noreply.github.com
 	yarinm: yarinm!microsoft.com, yarinm!users.noreply.github.com
-	yaron2: schneider.yaron!live.com, yaron2!users.noreply.github.com, yaronsc!microsoft.com
+	yaron2: schneider.yaron!live.com, yaron2!users.noreply.github.com, yaronsc!microsoft.com until 2021-11-01
 	yaxia: yaxia!microsoft.com
 	yayitserica: yayitserica!users.noreply.github.com from 2017-11-01
 	yebrahim: yebrahim!users.noreply.github.com until 2016-09-01

company_developers6.txt

@@ -7576,7 +7576,7 @@ Poll Everywhere:
 	ProTip: ProTip!users.noreply.github.com from 2015-06-01 until 2017-01-01
 Pollfish:
 	apollotonkosmo: apollotonkosmo!users.noreply.github.com from 2018-01-01
-	skonto: skonto!users.noreply.github.com until 2015-09-01
+	skonto: skonto!users.noreply.github.com, skontopo!redhat.com, st.kontopoulos!gmail.com until 2015-09-01
 Polly:
 	girishrao: rao.girish!gmail.com from 2019-08-01 until 2021-02-01
 PollyEx:
@@ -13259,6 +13259,8 @@ Red Hat Inc.:
 	zwx14700: zwx14700!users.noreply.github.com from 2020-06-01
 	zzzeek: mike_mp!zzzcomputing.com
 	zzztimbo: zzztimbo!users.noreply.github.com
+Red Hat inc:
+	skonto: skonto!users.noreply.github.com, skontopo!redhat.com, st.kontopoulos!gmail.com from 2020-06-01
 Red Kubes:
 	rawc0der: rawc0der!users.noreply.github.com from 2020-05-01
 Red Letter Films:

company_developers7.txt

@@ -622,6 +622,8 @@ Samsung Electronics Co. Ltd.:
 	zreigz: lukasz.zajaczkowski!ts.fujitsu.com, zreigz!gmail.com, zreigz!users.noreply.github.com until 2015-04-15
 Samsung Next:
 	betula: mail!betula.co from 2020-05-01 until 2020-11-01
+Samsung Research America Inc.:
+	electrocucaracha: chipahuac!hotmail.com, electrocucaracha!gmail.com, electrocucaracha!users.noreply.github.com, v.morales!samsung.com, victor.morales!intel.com from 2020-03-31
 Samsung RnD Noida:
 	prary: prary2!gmail.com from 2016-09-01 until 2017-07-01
 Samsung SDS:
@@ -5312,7 +5314,7 @@ Splunk Inc.:
 	NathanielRN: NathanielRN!users.noreply.github.com from 2018-05-01 until 2018-08-01
 	RassK: 4929112+RassK!users.noreply.github.com, rasmus.kuusmann!gmail.com, rkuusmann!splunk.com
 	Rauno56: Rauno56!users.noreply.github.com, rauno56!gmail.com, rviskus!splunk.com from 2021-03-08
-	TomRoSystems: 8647888+TomRoSystems!users.noreply.github.com, trojek!splunk.com
+	TomRoSystems: 8647888+TomRoSystems!users.noreply.github.com, trojek!splunk.com until 2022-02-01
 	abhide: abhide!users.noreply.github.com, amey15!gmail.com
 	abhide15: abhide15!users.noreply.github.com from 2019-08-01
 	agoallikmaa: ago.allikmaa!eesti.ee, agoallikmaa!users.noreply.github.com from 2020-10-01
@@ -7633,7 +7635,7 @@ SysEleven Gmbh:
 	bashofmann: bashofmann!googlemail.com, bashofmann!users.noreply.github.com from 2018-04-01
 	baurmatt: baurmatt!users.noreply.github.com, m.baur!syseleven.de from 2015-07-01
 	cbeneke: c.beneke!syseleven.de, c.beneke!wirelab.org, cbeneke!users.noreply.github.com until 2019-10-01
-	chrigl: chrigl!users.noreply.github.com, c.glaubitz!syseleven.de chris!chrigl.de from 2021-10-01
+	chrigl: c.glaubitz!syseleven.de, chrigl!users.noreply.github.com, chris!chrigl.de, christoph.glaubitz!innovo-cloud.de until 2017-01-01, from 2021-09-30
 	kubicgruenfeld: jakob!kartschall.de, kubicgruenfeld!users.noreply.github.com from 2017-06-01
 	maltejk: maltejk!users.noreply.github.com from 2017-04-01
 	multi-io: multi-io!users.noreply.github.com, o.klischat!syseleven.de, olaf.klischat!gmail.com, olaf.klischat!googlemail.com
@@ -16553,10 +16555,3 @@ Vivy GmbH:
 	lanwen: lanwen!users.noreply.github.com, lanwen!yandex-team.ru, lanwen!yandex.ru from 2018-04-01
 Viz Expres:
 	yashtewari: yashtewari!users.noreply.github.com, yashtewari1996!gmail.com until 2014-07-01
-VizExplorer:
-	tsing: tsing!jianqing.org, tsing!users.noreply.github.com from 2018-04-01
-	velo: velo!users.noreply.github.com from 2012-09-15 until 2017-02-15
-Vizbee:
-	arun057: arun!arunram.com from 2015-06-01 until 2016-08-01
-Vizlegal:
-	jalberto: ja!josealberto.org, jalberto!users.noreply.github.com from 2016-02-01

company_developers8.txt

@@ -1,6 +1,13 @@
 # This file is derived from developers_affiliations.txt and so should not be edited directly.
 # If you see an error, please update developers_affiliations.txt and this file will be fixed
 # when regenerated.
+VizExplorer:
+	tsing: tsing!jianqing.org, tsing!users.noreply.github.com from 2018-04-01
+	velo: velo!users.noreply.github.com from 2012-09-15 until 2017-02-15
+Vizbee:
+	arun057: arun!arunram.com from 2015-06-01 until 2016-08-01
+Vizlegal:
+	jalberto: ja!josealberto.org, jalberto!users.noreply.github.com from 2016-02-01
 Vizor:
 	joaoasrosa: joaoasrosa!gmail.com from 2015-03-01 until 2017-04-01
 Vizor Interactive:
@@ -3462,6 +3469,7 @@ Youwon Hungary Kft:
 	adamtajti: adamtajti!users.noreply.github.com until 2015-06-01
 Youzan:
 	absolute8511: absolute8511!users.noreply.github.com, cool8511!gmail.com from 2015-04-01
+	pigletfly: pigletfly!users.noreply.github.com, wangbing.adam!gmail.com
 Yoyo Holdings:
 	afking: afking!users.noreply.github.com, edward.mcfarlane!outlook.com from 2015-11-01 until 2016-12-01
 	htgc: togachiro!gmail.com from 2015-05-01
@@ -4162,6 +4170,8 @@ Zeus Learning:
 	Anuj2512: Anuj2512!users.noreply.github.com, chaudharianuj93!gmail.com from 2015-07-01 until 2017-07-01
 Zeus Living:
 	Zakjholt: zakjholt!users.noreply.github.com from 2017-11-01 until 2018-08-01
+Zeva Int.:
+	samimusallam: sami.musallam7!gmail.com, samusall!cisco.com from 2019-09-09 until 2022-01-31
 Zfort:
 	StasPiv: StasPiv!users.noreply.github.com from 2020-05-01 until 2020-12-01
 Zhejiang Dahua Technology Co. Ltd:
@@ -6480,7 +6490,7 @@ iMuto:
 	kevinpauli: kevin!thepaulis.com from 2020-01-01
 iNNOVO Cloud:
 	ainmosni: ainmosni!users.noreply.github.com, daniel!ams-sec.org from 2017-11-01
-	chrigl: chrigl!users.noreply.github.com, christoph.glaubitz!innovo-cloud.de from 2017-01-01 until 2021-09-30
+	chrigl: c.glaubitz!syseleven.de, chrigl!users.noreply.github.com, chris!chrigl.de, christoph.glaubitz!innovo-cloud.de from 2017-01-01 until 2021-09-30
 iNautix:
 	laxmikantbpandhare: laxmikantbpandhare!users.noreply.github.com until 2016-10-01
 iOO2 Systems:
@@ -8942,8 +8952,6 @@ zwibe:
 	bigsurge: stone6_leung!hotmail.com
 知小白信息技术有限公司:
 	xs3c: w90p710!gmail.com, xs3c!users.noreply.github.com from 2019-07-01 until 2019-09-01
-Youzan:
-	pigletfly: pigletfly!users.noreply.github.com, wangbing.adam!gmail.com
 福建特力惠信息科技股份有限公司:
 	newbe36524: newbe36524!qq.com from 2015-01-01 until 2018-03-01
 空间信息产业发展股份有限公司: