Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Conflicts:
.organizationmap
Trivial merge conflict as upstream had an additional entry
Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
Unaffiliated <no@organization.net> Jiantao He <hejiantao5@gmail.com>
Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
+Unaffiliated <no@organization.net> Jiaying Ren <mikulely@gmail.com>
+Unaffiliated <no@organization.net> John Coyle <dx9err@gmail.com>
Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>
Unaffiliated <no@organization.net> Jordan Dorne <jordan.dorne@gmail.com>
Unaffiliated <no@organization.net> Kadu Ribeiro <mail+github@carlosribeiro.me>