From 7937fccac78e507edd39d4b7be2ac7cf8870179e Mon Sep 17 00:00:00 2001
From: Aashil Patel <aashilpatel1993@gmail.com>
Date: Sat, 25 Feb 2017 15:17:04 -0500
Subject: [PATCH 1/4] Update authors list.

---
 AUTHORS | 367 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 364 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6d4c9842d4774c..1931950b01d540 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -359,7 +359,7 @@ Gil Pedersen <git@gpost.dk>
 Tyler Neylon <tylerneylon@gmail.com>
 Josh Erickson <josh@snoj.us>
 Golo Roden <webmaster@goloroden.de>
-Ron Korving <rkorving@wizcorp.jp>
+Ron Korving <ron@ronkorving.nl>
 Brandon Wilson <chlavois@gmail.com>
 Ian Babrou <ibobrik@gmail.com>
 Bearice Ren <bearice@gmail.com>
@@ -878,8 +878,6 @@ Hideki Yamamura <hideki.yamamura@gmail.com>
 Lenny Markus <lmarkus@paypal.com>
 Nelson Pecora <nelson@yoshokatana.com>
 Graham Fairweather <xotic750@gmail.com>
-Ron Korving <ron@ronkorving.nl>
-Xotic750 <xotic750@gmail.com>
 Nicholas Young <nicholas@nicholaswyoung.com>
 Chris Johnson <chris.s.johnson4@gmail.com>
 Bo Borgerson <gigabo@gmail.com>
@@ -1056,6 +1054,7 @@ Joran Siu <joransiu@ca.ibm.com>
 Vitaly Tomilov <vitaly-t@users.noreply.github.com>
 Ratikesh Misra <ratikesh92@gmail.com>
 Alex Perkins <aperkin@rei.com>
+Vse Mozhet Byt <vsemozhetbyt@gmail.com>
 Bethany N Griggs <Bethany.Griggs@uk.ibm.com>
 Joe Esposito <joe@joeyespo.com>
 Erin Spiceland <yes@erin.codes>
@@ -1082,5 +1081,367 @@ Jason Hedrick <thecoolestguy@gmail.com>
 David Keeler <dkeeler@mozilla.com>
 Zwb <zwb.ict@gmail.com>
 Paul Grock <paulgrock@gmail.com>
+Hubert Mine <hubertmine@hotmail.fr>
+Dan Fabulich <dan.fabulich@redfin.com>
+Mike Ralphson <mike.ralphson@gmail.com>
+Alexis374 <879736822@qq.com>
+atstojanov <atstojanov@gmail.com>
+Thomas Hunter II <me@thomashunter.name>
+Christopher Dunavan <github@hypersprite.com>
+Peter Ogilvie <code@ogilvie.us.com>
+Dan.Williams <daniel@chat.za.net>
+Teddy Katz <teddy.katz@gmail.com>
+Kalman Hazins <kalmanh@gmail.com>
+Ltrlg <ltrlg.wp@gmail.com>
+Dennis Schwartz <dennis@repositive.io>
+Yevgen Safronov <sejoker@gmail.com>
+Tobias Kahse <tobias.kahse@hpe.com>
+Sébastien Barbieri <seba@rtbf.be>
+Pavol Otcenas <pavol@otcenas.eu>
+Alessandro Metta <n0f3@outlook.com>
+Dany Shaanan <danyshaanan@gmail.com>
+Ishan Aditya <ishanaditya@gmail.com>
+Rachel <rachel.black@flashtalking.com>
+Jason Ginchereau <jasongin@microsoft.com>
+Paul Kiddie <paul@paulkiddie.com>
+scott stern <scott.stern06@gmail.com>
+Danny Guo <dannyguo91@gmail.com>
+lrlna <shestak.irina@gmail.com>
+matt-in-a-hat <matt@mediasuite.co.nz>
+Thomas van Lankveld <thomas@cell-0.com>
+Tarjei Husøy <git@thusoy.com>
+Wietse Venema <wvenema@xebia.com>
+Jonathan Prince <jonathan.prince@gmail.com>
+Fikret Burak Gazioglu <burakgazi@static.ip-217-149-135-181.signet.nl>
+delvedor <tommydelved@gmail.com>
+Shigeki Ohtsu <ohtsu@ohtsu.org>
+Jermaine Oppong <jeropp00@gmail.com>
+Richard Walker <digitalsadhu@gmail.com>
+matzavinos <matzavinos@workable.com>
+Alfred Cepeda <AlfredJCepeda@gmail.com>
+Niklas Ingholt <niklas@ingholt.com>
+Michael-Rainabba Richardson <rainabba@gmail.com>
+oogz <oogz@users.noreply.github.com>
+Fangdun Cai (Fundon) <cfddream@gmail.com>
+Rene Weber <weber.rene@live.de>
+Lauren Spiegel <lhspiegel@gmail.com>
+Lydia Katsamberis <llkats@gmail.com>
+mpmckenna8 <mpmckenna8@me.com>
+nohmapp <nohman20@gmail.com>
+Matt Lang <matt@mediasuite.co.nz>
+Marc-Aurèle DARCHE <ma.darche@cynode.org>
+fen <jonairl@icloud.com>
+Christopher Fujino <christopherfujino@gmail.com>
+Richard Hong <rich.hong@gmail.com>
+Akito Ito <akito_ito@r.recruit.co.jp>
+Lydia Kats <llkats@gmail.com>
+Madhav Gharmalkar <gharmalkar.madhav@gmail.com>
+Mike Woods <mikeswoods@gmail.com>
+Daniel Stenberg <daniel@haxx.se>
+Abner Chou <zhcjtht@hotmail.com>
+Bryan Bess <squarejaw@bsbess.com>
+Michael Macherey <macherey@gmx.net>
+Sudaraka Wijesinghe <sudaraka@sudaraka.org>
+Miguel Angel Asencio Hurtado <maasencioh@gmail.com>
+ss22ever <ss22ever@users.noreply.github.com>
+Anna Magdalena Kedzierska <anna.mag.kedzierska@gmail.com>
+Christopn Noelke <c.noelke@meteocontrol.de>
+Rémy MEJA <remy.meja@inist.fr>
+Alex Jordan <alex@strugee.net>
+Mariusz 'koder' Chwalba <mariusz.chwalba@cashbill.pl>
+Juan Andres Andrango <andrango.juanandres@gmail.com>
+larissayvette <larissayvette55@gmail.com>
+jessicaquynh <jessica.quynh.tran@gmail.com>
+Ilya Frolov <ilfroloff@gmail.com>
+Tanuja-Sawant <thinkbigtanu@gmail.com>
+Bradley T. Hughes <bradleythughes@fastmail.fm>
+solebox <solekiller@gmail.com>
+John Vilk <jvilk@cs.umass.edu>
+Tyler Brazier <tyler@tylerbrazier.com>
+marzelin <marzelin@gmail.com>
+Benji Marinacci <bcmarinacci@icloud.com>
+Indrek Ardel <indrek@ardel.eu>
+Parambir Singh <parambirs@gmail.com>
+maasencioh <maasencioh@gmail.com>
+Niels Nielsen <niels@protectwise.com>
+Rod Machen <rod.machen@help.com>
+Marc Udoff <udoff@deshaw.com>
+Oliver Salzburg <oliver.salzburg@gmail.com>
+Jeena Lee <ijeenalee@gmail.com>
+BethGriggs <Bethany.Griggs@uk.ibm.com>
+Deverick <deverick@me.com>
+anu0012 <anurag30671371@gmail.com>
+Alejandro Oviedo Garcia <alejandro.oviedo.g@gmail.com>
+jseagull <jseagull@aliyun.com>
+Olan Byrne <obyrne@turnitin.com>
+Emanuele DelBono <emanuele@codiceplastico.com>
+Aaron Bieber <aaron@bolddaemon.com>
+Gerges Beshay <gerges@beshay.xyz>
+Isobel Redelmeier <iredelmeier@gmail.com>
+kobelb <brandon.kobel@elastic.co>
+coderaiser <mnemonic.enemy@gmail.com>
+Pedro Victor <pvsousalima@gmail.com>
+jedireza <reza@akhavan.me>
+Yangyang Liu <scanletfever@gmail.com>
+Zeke Sikelianos <zeke@sikelianos.com>
+Wayne Andrews <andreww@uk.ibm.com>
+Andreas Lind <andreas@one.com>
+Adam Majer <amajer@suse.de>
+Oscar Morrison <me@oscarmorrison.com>
+Jaideep Bajwa <bjaideep@ca.ibm.com>
+timathon <timathon@outlook.com>
+Timothy <zzzzBov@gmail.com>
+imatvieiev <idmatvieiev@gmail.com>
+kohta ito <kohta110@gmail.com>
+ikasumi_wt <wtsnyk13@gmail.com>
+Yoshiya Hinosawa <stibium121@gmail.com>
+Syuhei Kobayashi <nanocloudx@gmail.com>
+YutamaKotaro <california.dreamin.never.die@gmail.com>
+MURAKAMI Masahiko <fossamagna2@gmail.com>
+Thomas Watson Steen <w@tson.dk>
+Daijiro Yamada <yamad@daiji.ro>
+Kelvin Jin <kelvinjin@google.com>
+Mitsuo Utano <utano320@gmail.com>
+masashi.g <masashi.g@gmail.com>
+Bethany Griggs <Bethany.Griggs@uk.ibm.com>
+Italo A. Casas <italo@italoacasas.com>
+Kenneth Skovhus <kenneth.skovhus@gmail.com>
+Aaron Petcoff <hello@aaronpetcoff.me>
+Rahat Ahmed <rahatarmanahmed@gmail.com>
+monkick <saruyama.monki@gmail.com>
+Adam Brunner <adambrunner@users.noreply.github.com>
+子丶言 <amery@xiangfa.org>
+atrioom <atrioom@gmail.com>
+Dan Koster <dankoster@users.noreply.github.com>
+Pedro Lima <pvsousalima@gmail.com>
+Francis Gulotta <wizard@roborooter.com>
+Yosuke Saito <yosuke.saito1202@gmail.com>
+mkamakura <kamakura.masaya@gmail.com>
+kalrover <kal@zigexn.co.jp>
+brad-decker <bhdecker84@gmail.com>
+ben_cripps <ben@benjamincripps.com>
+Walter Beller-Morales <walter.beller.morales@gmail.com>
+Safia Abdalla <safia@safia.rocks>
+makenova <themarchmyth@gmail.com>
+Adriana Rios <amrios2817@gmail.com>
+scalkpdev <garvin.ling@kp.org>
+Ashton Kinslow <github@ashtonkinslow.com>
+Kevin Zurawel <kzurawel@gmail.com>
+Wes Tyler <wtyler@xogrp.com>
+shiya <luo.shiya@gmail.com>
+Greg Valdez <ghvaldez@gmail.com>
+Bidur Adhikari <badhikari@godaddy.com>
+Kyle Carter <kyle.andrew.carter@gmail.com>
+adelmann <adelmann@adobe.com>
+Daniel Pittman <daniel@pittmo.net>
+Ian White <ian.white.developer@gmail.com>
+Chris Bystrek <chris.bystrek@gmail.com>
+Christine Hong <christine@dogvacay.com>
+Oscar Martinez <oscar.martinez@hautelook.com>
+Aileen <avillanueva>
+David Bradford <dbradf@gmail.com>
+stokingerl <liamstokinger@gmail.com>
+Johnny Reading <johnny@hellowallet.com>
+Mitchell Stoutin <mitchell.stoutin@gmail.com>
+Matt Wilson <matt.wilson@creditcards.com>
+Matt Webb <matthew.webb@blinker.com>
+rajatk <rajatk@netflix.com>
+Peter Masucci <peter.a.masucci@gmail.com>
+Daniel Flores <dflores009@gmail.com>
+Harish Tejwani <harish@wizni.com>
+Jonathan Darling <jmdarling@me.com>
+JDHarmon <jason@jdharmon.com>
+bjdelro <brendandelrosario@gmail.com>
+Hitesh Kanwathirtha <digitalinfinity@gmail.com>
+davidmarkclements <david.clements@nearform.com>
+Cesar Hernandez <chernandez@xogrp.com>
+Konstantin Likhter <konstantin@likhter.ru>
+Richard Karmazin <richard.karmazin@solarwinds.com>
+Hutson Betts <destroyerofbuilds@users.noreply.github.com>
+Kent.Fan <Kent.Fan@gmail.com>
+Jay Brownlee <jay.brownlee@help.com>
+Outsider <outsideris@gmail.com>
+Sarah Meyer <sarahsaltrick@gmail.com>
+anoff <offenhaeuser@gmail.com>
+Sean Villars <stvillars8@gmail.com>
+k3kathy <kathy.yvy.truong@gmail.com>
+Exlipse7 <exlipse7@@users.noreply.github.com>
+Josh Mays <josh.mays@creditcards.com>
+Matt Crummey <mcrummey@validusa.com>
+michael6 <michaelf614@gmail.com>
+Raja Panidepu <rpanidepu@lmdv-rpani.jomax.paholdings.com>
+Ethan Arrowood <ethan.arrowood@gmail.com>
+Dan Villa <danielavilla02@gmail.com>
+CodeTheInternet <edlerner+github@protonmail.com>
+Eric Gonzalez <ericxgonzalez@gmail.com>
+sxa555 <sxa@uk.ibm.com>
+rgoodwin <rjngoodwin@gmial.com>
+Nigel Kibodeaux <nigel@team.about.me>
+fmizzell <fmizzell@1312210.no-reply.drupal.org>
+cdnadmin <cdnadmin@collaborare.net>
+Paul Lucas <pjl.paul@gmail.com>
+levsoroka <levsoroka@gmail.com>
+Christopher Rokita <chris@livio.io>
+Peter Diaz <pdiaz@bioware.com>
+Michael Alexander <michael_alexander@us.ibm.com>
+Ilya Potuzhnov <ipotuzhnov@gmail.com>
+J Scott Chapman <scott8675309@gmail.com>
+Erez Weiss <ruggertech@gmail.com>
+Scott Smereka <scott.smereka@gmail.com>
+Fabrice Tatieze <fabrice.tatieze@nike.com>
+Uttam Pawar <uttam.c.pawar@intel.com>
+blugavere <b.lugavere@gmail.com>
+Punit Buch <punit.buch@gmail.com>
+mark hughes <mrhughes@xogrp.com>
+Russell Sherman <russell.t.sherman@gmail.com>
+hirabhullar <hbhullar@starbucks.com>
+Paul Chin <pchinjr@gmail.com>
+Matt Phillips <matthewcannonphillips@gmail.com>
+Daryl Thayil <darylt@porch.com>
+Deepti Agrawal <dagrawal@godaddy.com>
+Axel Monroy <xaxelmonroyx@gmail.com>
+Jason Humphrey <Humphrey.jason32@gmail.com>
+amrios <amrios@us.ibm.com>
+Chris Henney <CHenney@walmartlabs.com>
+Yojan Shrestha <sickgrin@gmail.com>
+Rodrigo Palma <rpalma@mx1.ibm.com>
+Sam Shull <sam+github@samshull.com>
+Michael-Bryant Choa <mbchoa@gmail.com>
+CodeVana <codevaana@gmail.com>
+Daniel Sims <danielsims@quickenloans.com>
+Jenna Vuong <jennavuong@gmail.com>
+Rob Adelmann <robadelmann@gmail.com>
+Diego Paez <paez.di@gmail.com>
+Paul Graham <paul@bytefair.com>
+Jared Young <jared.young@panasonic.aero>
+vazina robertson <vazina.robertson@gmail.com>
+Bruce Lai <bruceplai@gmail.com>
+eudaimos <jeff@hwgray.com>
+Kyle Corsi <kmccmk9@gmail.com>
+Luca Maraschi <luca.maraschi@gmail.com>
+Karl Böhlmark <karl.bohlmark@netinsight.se>
+Gregory <gregory.petrosyan@mail.utoronto.ca>
+James Tenenbaum <James Tenenbaum>
+pallxk <github@pallxk.com>
+Amar Zavery <amzavery@microsoft.com>
+Prieto, Marcos <marcos.prieto@fmr.com>
+Joyee Cheung <joyeec9h3@gmail.com>
+hveldstra <h@veldstra.org>
+Siddhartha Sahai <siddharthasahai99@gmail.com>
+Andy Chen <amazingandyyy@gmail.com>
+Lucas Holmquist <lholmqui@redhat.com>
+mfrance <mf212mf@gmail.com>
+Aaron Williams <aaron.williams@stratfor.com>
+Alex Newman <posix4e@gmail.com>
+Travis Bretton <bluesailstudio@gmail.com>
+Adao Junior <junior@me.com>
+weyj4 <weylandjoyner4@gmail.com>
+Joe Doyle <joe@joedoyle.us>
+Bill Ticehurst <billti@hotmail.com>
+misterpoe <raymondksi@gmail.com>
+Emanuel Buholzer <contact@emanuelbuholzer.com>
+Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in>
+Duy Le <dle@walmartlabs.com>
+Neeraj Sharma <nitsnwits@gmail.com>
+Ashita Nagesh <ashita.nagesh@gmail.com>
+Jason Wohlgemuth <jhwohlgemuth@gmail.com>
+Segu Riluvan <riluvan@gmail.com>
+Emanuel Buholzer <EmanuelBuholzer@outlook.com>
+Avery, Frank <FrankAvery@quickenloans.com>
+Chase Starr <chasestarr@gmail.com>
+sivaprasanna <sivaprasanna@gmail.com>
+Troy Connor <troy0820@users.noreply.github.com>
+Wallace Zhang <zhangwnn1@gmail.com>
+Segu Riluvan <rilwan22@hotmail.com>
+Rico Cai <rico@yunkon.com>
+Kevin Cox <kevin@wscon.com>
+Brian Chirgwin <bchirgwin@yahoo.com>
+Ken Russo <k.russo@f5.com>
+Christy Leung <christy.leung@help.com>
+René Schünemann <rene.schuenemann@sap.com>
+Jeremy Yallop <yallop@docker.com>
+malen <malenesok007@yahoo.com>
+Kailean Courtney <kailean@gmail.com>
+sarahmeyer <sarahsaltrick@gmail.com>
+Fumiya KARASAWA <krswfmy@gmail.com>
+Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
+jBarz <jBarz@users.noreply.github.com>
+Paul Graham <homosaur@gmail.com>
+Nate <nfoxley@stedwards.edu>
+Chris Story <storytimesolutions@gmail.com>
+Stewart X Addison <sxa@uk.ibm.com>
+Matthew Garrett <mjg59@coreos.com>
+Hitesh Kanwathirtha <hiteshk@microsoft.com>
+David Goussev <dgoussev@gmail.com>
+Beth Griggs <Bethany.Griggs@uk.ibm.com>
+George Adams <george.adams@uk.ibm.com>
+Benedikt Meurer <bmeurer@google.com>
+Kai Cataldo <kaicataldo@gmail.com>
+Victor Felder <victor@draft.li>
+Yann Pringault <yann@cinq-s.com>
+Evan Torrie <evant@yahoo-inc.com>
+Michael Lefkowitz <lefkowitz.michael@gmail.com>
+vitkarpov <viktor.s.karpov@gmail.com>
+Lukasz Gasior <lukasz@gasior.net.pl>
+Jonathan Boarman <jb@jonathan.net>
+Johannes Rieken <johannes.rieken@gmail.com>
+Alexey Orlenko <eaglexrlnk@gmail.com>
+Nathan Phillip Brink <binki@gentoo.org>
+istinson <ian.c.stinson@gmail.com>
+Javis Sullivan <javissullivan@gmail.com>
+Irene Li <li.irene1@gmail.com>
+Yuya Tanaka <yuya.presto@gmail.com>
+Josh Hollandsworth <josh.hollandsworth@gmail.com>
+Sumit Goel <sumit@goel.pw>
+stefan judis <stefanjudis@gmail.com>
+Mark <mail.ormark@gmail.com>
+Jessica Quynh Tran <jessica.quynh.tran@gmail.com>
+Travis Meisenheimer <tmeisenh@gmail.com>
+Vinícius do Carmo <vinicius.m.do.carmo@gmail.com>
+Birunthan Mohanathas <birunthan@mohanathas.com>
+John Barboza <jbarboza@ca.ibm.com>
+richnologies <me@richnologies.io>
+legalcodes <jwtippens@gmail.com>
+Travis Meisenheimer <travis@indexoutofbounds.com>
+Aashil Patel <aashilpatel1993@gmail.com>
+Alex Ling <hkalexling@gmail.com>
+Peter Mescalchin <peter@magnetikonline.com>
+Joshua Colvin <joshua@joshuacolvin.net>
+Yuta Hiroto <git@about-hiroppy.com>
+John Maguire <jonnie.maguire@gmail.com>
+Marlena Compton <marlena.compton@gmail.com>
+Myles Borins <mylesborins@google.com>
+Gonen Dukas <gonenduk@gmail.com>
+Roee Kasher <roee@fire.glass>
+nanxiongchao <nanxiongchao@loongson.cn>
+matsuda-koushi <cauchymazda@r.recruit.co.jp>
+Myk Melez <myk@mykzilla.org>
+Diego Rodríguez Baquero <diegorbaquero@gmail.com>
+Umair Ishaq <umair29@gmail.com>
+Timo Tijhof <krinklemail@gmail.com>
+Sebastian Van Sande <sebastian@vansande.org>
+Daiki Arai <darai0512@yahoo.co.jp>
+ALJCepeda <AlfredJCepeda@gmail.com>
+Sebastian Roeder <afk@Sebastians-iMac.local>
+toboid <toboid@users.noreply.github.com>
+Shubheksha Jalan <jshubheksha@gmail.com>
+jobala <japheth.obala@andela.com>
+asafdav2 <asafdav2@gmail.com>
+Sota Yamashita <sota.yamashita@gmail.com>
+David Benjamin <davidben@google.com>
+Akito Ito <akito0107@gmail.com>
+樋口　彰 <a_higuchi@r.recruit.co.jp>
+QianJin2013 <osexp2003@gmail.com>
+Kenan Yildirim <kenan@kenany.me>
+Alexander <alx.safari@gmail.com>
+Christopher Hiller <boneskull@boneskull.com>
+xiaoyu <306766053@qq.com>
+Arseniy Maximov <localhost@kern0.ru>
+Eric Christie <ericjchristie@gmail.com>
+Tarang Hirani <tarang9211@gmail.com>
+Dean Coakley <dean.s.coakley@gmail.com>
+Dmitry Tsvettsikh <dmitrycvet@gmail.com>
+Jason Wilson <jason@wilsons.io>
+Karan Thakkar <karanjthakkar@gmail.com>
 
 # Generated by tools/update-authors.sh

From 25b6fdbd46dd5f119e76b622dfb25cc4c071dcec Mon Sep 17 00:00:00 2001
From: Aashil Patel <aashilpatel1993@gmail.com>
Date: Wed, 1 Mar 2017 14:11:42 -0500
Subject: [PATCH 2/4] Update AUTHORS based on feedback from authors

* Update mailmap to record their preferred choice.
---
 .mailmap | 17 +++++++++++++++++
 AUTHORS  | 33 ++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/.mailmap b/.mailmap
index 722995b6b04b63..294f55013955ec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,19 +7,25 @@ Alexey Kupershtokh <alexey.kupershtokh@gmail.com> <wicked@alawar.com>
 Alexis Campailla <alexis@janeasystems.com> <orangemocha@github.com>
 Alexis Sellier <self@cloudhead.net>
 Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
+Andreas Offenhaeuser <offenhaeuser@gmail.com> anoff <offenhaeuser@gmail.com>
 Andy Bettisworth <andy.bettisworth@accreu.com>
+Angel Stoyanov <atstojanov@gmail.com> atstojanov <atstojanov@gmail.com>
 Anna Henningsen <anna@addaleax.net>
 Aria Stewart <aredridel@dinhe.net> <aredridel@nbtsc.org>
 Arlo Breault <arlolra@gmail.com>
 Artem Zaytsev <a.arepo@gmail.com>
 Arnout Kazemier <info@3rd-Eden.com> <3rd-Eden@users.noreply.github.com>
+Asaf David <asafdav2@gmail.com> asafdav2 <asafdav2@gmail.com>
 Atsuo Fukaya <fukayatsu@gmail.com>
+Ben Lugavere <b.lugavere@gmail.com> blugavere <b.lugavere@gmail.com>
 Ben Noordhuis <info@bnoordhuis.nl> <bnoordhuis@bender.(none)> <ben@strongloop.com>
 Ben Taber <ben.taber@gmail.com>
 Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
 Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
 Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
+Brad Decker <bhdecker84@gmail.com> brad-decker <bhdecker84@gmail.com>
 Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
+Brandon Kobel <kobelb@gmail.com> kobelb <brandon.kobel@elastic.co>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Caleb Boyd <caleb.boyd@gmail.com>
@@ -78,6 +84,8 @@ Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
 Johann Hofmann <git@johann-hofmann.com>
+John Barboza <jbarboza@ca.ibm.com> jBarz <jBarz@users.noreply.github.com>
+Jon Tippens <jwtippens@gmail.com> legalcodes <jwtippens@gmail.com>
 Jonas Pfenniger <jonas@pfenniger.name> <jonas@stvs.ch>
 Jonathan Ong <jonathanrichardong@gmail.com> <jonathanong@users.noreply.github.com>
 Jonathan Persson <persson.jonathan@gmail.com> <jonathan.persson@creuna.se>
@@ -91,6 +99,7 @@ Jérémy Lal <kapouer@melix.org>
 Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
 Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
 Karl Skomski <karl@skomski.com> <mail@skomski.com>
+Kathy Truong <kathy.yvy.truong@gmail.com> k3kathy <kathy.yvy.truong@gmail.com>
 Kazuyuki Yamada <tasogare.pg@gmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
 Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
@@ -103,6 +112,7 @@ Malte-Thorben Bruns <skenqbx@gmail.com>
 Malte-Thorben Bruns <skenqbx@googlemail.com>
 Marcin Cieślak <saper@marcincieslak.com>
 Marcin Cieślak <saper@marcincieslak.com> <saper@saper.info>
+Marcin Zielinski <marzelin@gmail.com> marzelin <marzelin@gmail.com>
 Marti Martz <thalamew@q.com>
 Martial James Jefferson <martial.jefferson@gmail.com>
 Mathias Pettersson <mape@mape.me>
@@ -126,6 +136,8 @@ Ratikesh Misra <ratikesh92@gmail.com>
 Ray Morgan <rmorgan@zappos.com>
 Ray Solomon <raybsolomon@gmail.com>
 Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
+Reza Akhavan <reza@akhavan.me> jedireza <reza@akhavan.me>
+Ricardo Sánchez Gregorio <me@richnologies.io> richnologies <me@richnologies.io>
 Rick Olson <technoweenie@gmail.com>
 Roman Klauke <romaaan.git@gmail.com> <romankl@users.noreply.github.com>
 Roman Reiss <me@silverwind.io>
@@ -151,6 +163,8 @@ Stefan Budeanu <stefan@budeanu.com>
 Stefan Bühler <stbuehler@web.de>
 Steve Mao <maochenyan@msn.com>
 Steven R. Loomis <srl@icu-project.org> <srloomis@us.ibm.com>
+Suramya shah <shah.suramya@gmail.com> ss22ever <ss22ever@users.noreply.github.com>
+Toby Stableford <tobytronics@gmail.com> toboid <toboid@users.noreply.github.com>
 Todd Kennedy <todd@selfassembled.org> <toddself@users.noreply.github.com>
 TJ Holowaychuk <tj@vision-media.ca>
 TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
@@ -163,12 +177,15 @@ Tim Caswell <tim@creationix.com> <tim@0-26-8-e9-4c-e1.dyn.utdallas.edu>
 Tim Price <timprice@mangoraft.com>
 Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
 Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.com>
+Timothy Leverett <zzzzBov@gmail.com> Timothy <zzzzBov@gmail.com>
 Tom Hughes <tom.hughes@palm.com> <tomtheengineer@gmail.com>
 Tom Hughes-Croucher <tom_croucher@yahoo.com>
 Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
+Viktor Karpov <viktor.s.karpov@gmail.com> vitkarpov <viktor.s.karpov@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Vladimir de Turckheim <vlad2t@hotmail.com>
+vsemozhetbyt <vsemozhetbyt@gmail.com> Vse Mozhet Byt <vsemozhetbyt@gmail.com>
 Willi Eggeling <email@wje-online.de>
 Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
 Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
diff --git a/AUTHORS b/AUTHORS
index 1931950b01d540..0d445f80553de5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1054,7 +1054,6 @@ Joran Siu <joransiu@ca.ibm.com>
 Vitaly Tomilov <vitaly-t@users.noreply.github.com>
 Ratikesh Misra <ratikesh92@gmail.com>
 Alex Perkins <aperkin@rei.com>
-Vse Mozhet Byt <vsemozhetbyt@gmail.com>
 Bethany N Griggs <Bethany.Griggs@uk.ibm.com>
 Joe Esposito <joe@joeyespo.com>
 Erin Spiceland <yes@erin.codes>
@@ -1085,7 +1084,7 @@ Hubert Mine <hubertmine@hotmail.fr>
 Dan Fabulich <dan.fabulich@redfin.com>
 Mike Ralphson <mike.ralphson@gmail.com>
 Alexis374 <879736822@qq.com>
-atstojanov <atstojanov@gmail.com>
+Angel Stoyanov <atstojanov@gmail.com>
 Thomas Hunter II <me@thomashunter.name>
 Christopher Dunavan <github@hypersprite.com>
 Peter Ogilvie <code@ogilvie.us.com>
@@ -1143,7 +1142,7 @@ Bryan Bess <squarejaw@bsbess.com>
 Michael Macherey <macherey@gmx.net>
 Sudaraka Wijesinghe <sudaraka@sudaraka.org>
 Miguel Angel Asencio Hurtado <maasencioh@gmail.com>
-ss22ever <ss22ever@users.noreply.github.com>
+Suramya shah <shah.suramya@gmail.com>
 Anna Magdalena Kedzierska <anna.mag.kedzierska@gmail.com>
 Christopn Noelke <c.noelke@meteocontrol.de>
 Rémy MEJA <remy.meja@inist.fr>
@@ -1158,7 +1157,7 @@ Bradley T. Hughes <bradleythughes@fastmail.fm>
 solebox <solekiller@gmail.com>
 John Vilk <jvilk@cs.umass.edu>
 Tyler Brazier <tyler@tylerbrazier.com>
-marzelin <marzelin@gmail.com>
+Marcin Zielinski <marzelin@gmail.com>
 Benji Marinacci <bcmarinacci@icloud.com>
 Indrek Ardel <indrek@ardel.eu>
 Parambir Singh <parambirs@gmail.com>
@@ -1178,10 +1177,10 @@ Emanuele DelBono <emanuele@codiceplastico.com>
 Aaron Bieber <aaron@bolddaemon.com>
 Gerges Beshay <gerges@beshay.xyz>
 Isobel Redelmeier <iredelmeier@gmail.com>
-kobelb <brandon.kobel@elastic.co>
+Brandon Kobel <kobelb@gmail.com>
 coderaiser <mnemonic.enemy@gmail.com>
 Pedro Victor <pvsousalima@gmail.com>
-jedireza <reza@akhavan.me>
+Reza Akhavan <reza@akhavan.me>
 Yangyang Liu <scanletfever@gmail.com>
 Zeke Sikelianos <zeke@sikelianos.com>
 Wayne Andrews <andreww@uk.ibm.com>
@@ -1190,7 +1189,7 @@ Adam Majer <amajer@suse.de>
 Oscar Morrison <me@oscarmorrison.com>
 Jaideep Bajwa <bjaideep@ca.ibm.com>
 timathon <timathon@outlook.com>
-Timothy <zzzzBov@gmail.com>
+Timothy Leverett <zzzzBov@gmail.com>
 imatvieiev <idmatvieiev@gmail.com>
 kohta ito <kohta110@gmail.com>
 ikasumi_wt <wtsnyk13@gmail.com>
@@ -1218,7 +1217,7 @@ Francis Gulotta <wizard@roborooter.com>
 Yosuke Saito <yosuke.saito1202@gmail.com>
 mkamakura <kamakura.masaya@gmail.com>
 kalrover <kal@zigexn.co.jp>
-brad-decker <bhdecker84@gmail.com>
+Brad Decker <bhdecker84@gmail.com>
 ben_cripps <ben@benjamincripps.com>
 Walter Beller-Morales <walter.beller.morales@gmail.com>
 Safia Abdalla <safia@safia.rocks>
@@ -1262,9 +1261,9 @@ Kent.Fan <Kent.Fan@gmail.com>
 Jay Brownlee <jay.brownlee@help.com>
 Outsider <outsideris@gmail.com>
 Sarah Meyer <sarahsaltrick@gmail.com>
-anoff <offenhaeuser@gmail.com>
+Andreas Offenhaeuser <offenhaeuser@gmail.com>
 Sean Villars <stvillars8@gmail.com>
-k3kathy <kathy.yvy.truong@gmail.com>
+Kathy Truong <kathy.yvy.truong@gmail.com>
 Exlipse7 <exlipse7@@users.noreply.github.com>
 Josh Mays <josh.mays@creditcards.com>
 Matt Crummey <mcrummey@validusa.com>
@@ -1290,7 +1289,7 @@ Erez Weiss <ruggertech@gmail.com>
 Scott Smereka <scott.smereka@gmail.com>
 Fabrice Tatieze <fabrice.tatieze@nike.com>
 Uttam Pawar <uttam.c.pawar@intel.com>
-blugavere <b.lugavere@gmail.com>
+Ben Lugavere <b.lugavere@gmail.com>
 Punit Buch <punit.buch@gmail.com>
 mark hughes <mrhughes@xogrp.com>
 Russell Sherman <russell.t.sherman@gmail.com>
@@ -1365,7 +1364,7 @@ Kailean Courtney <kailean@gmail.com>
 sarahmeyer <sarahsaltrick@gmail.com>
 Fumiya KARASAWA <krswfmy@gmail.com>
 Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
-jBarz <jBarz@users.noreply.github.com>
+John Barboza <jbarboza@ca.ibm.com>
 Paul Graham <homosaur@gmail.com>
 Nate <nfoxley@stedwards.edu>
 Chris Story <storytimesolutions@gmail.com>
@@ -1381,7 +1380,7 @@ Victor Felder <victor@draft.li>
 Yann Pringault <yann@cinq-s.com>
 Evan Torrie <evant@yahoo-inc.com>
 Michael Lefkowitz <lefkowitz.michael@gmail.com>
-vitkarpov <viktor.s.karpov@gmail.com>
+Viktor Karpov <viktor.s.karpov@gmail.com>
 Lukasz Gasior <lukasz@gasior.net.pl>
 Jonathan Boarman <jb@jonathan.net>
 Johannes Rieken <johannes.rieken@gmail.com>
@@ -1400,8 +1399,8 @@ Travis Meisenheimer <tmeisenh@gmail.com>
 Vinícius do Carmo <vinicius.m.do.carmo@gmail.com>
 Birunthan Mohanathas <birunthan@mohanathas.com>
 John Barboza <jbarboza@ca.ibm.com>
-richnologies <me@richnologies.io>
-legalcodes <jwtippens@gmail.com>
+Ricardo Sánchez Gregorio <me@richnologies.io>
+Jon Tippens <jwtippens@gmail.com>
 Travis Meisenheimer <travis@indexoutofbounds.com>
 Aashil Patel <aashilpatel1993@gmail.com>
 Alex Ling <hkalexling@gmail.com>
@@ -1423,10 +1422,10 @@ Sebastian Van Sande <sebastian@vansande.org>
 Daiki Arai <darai0512@yahoo.co.jp>
 ALJCepeda <AlfredJCepeda@gmail.com>
 Sebastian Roeder <afk@Sebastians-iMac.local>
-toboid <toboid@users.noreply.github.com>
+Toby Stableford <tobytronics@gmail.com>
 Shubheksha Jalan <jshubheksha@gmail.com>
 jobala <japheth.obala@andela.com>
-asafdav2 <asafdav2@gmail.com>
+Asaf David <asafdav2@gmail.com>
 Sota Yamashita <sota.yamashita@gmail.com>
 David Benjamin <davidben@google.com>
 Akito Ito <akito0107@gmail.com>

From 1e6aadf912ec83eb2dd939da2cc34b025b9ceb75 Mon Sep 17 00:00:00 2001
From: Aashil Patel <aashilpatel1993@gmail.com>
Date: Sat, 15 Apr 2017 13:13:22 -0400
Subject: [PATCH 3/4] Remove duplicates based on some user's feedback

* Maintain the order of contribution
---
 .mailmap | 44 ++++++++++++++++++++++++++----
 AUTHORS  | 81 +++++++++++++++-----------------------------------------
 2 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/.mailmap b/.mailmap
index 294f55013955ec..a2b1fce896f284 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,8 @@
+Aaron Bieber <aaron@bolddaemon.com> <deftly@gmail.com>
 Aaron Heckmann <aaron.heckmann@gmail.com> <aaron.heckmann+github@gmail.com>
 Abe Fettig <abefettig@gmail.com> <abe@fettig.net>
+Akito Ito <akito0107@gmail.com> <akito_ito@r.recruit.co.jp>
+Alejandro Oviedo Garcia <alejandro.oviedo.g@gmail.com> Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
 Alex Hultman <alexhultman@gmail.com>
 Alex Kocharin <rlidwka@kocharin.ru>
 Alex Kocharin <rlidwka@kocharin.ru> <alex@kocharin.ru>
@@ -20,15 +23,22 @@ Atsuo Fukaya <fukayatsu@gmail.com>
 Ben Lugavere <b.lugavere@gmail.com> blugavere <b.lugavere@gmail.com>
 Ben Noordhuis <info@bnoordhuis.nl> <bnoordhuis@bender.(none)> <ben@strongloop.com>
 Ben Taber <ben.taber@gmail.com>
+Benjamin Waters <benjamin.waters@outlook.com> <ben25890@gmail.com>
 Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
 Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
 Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
+Beth Griggs <Bethany.Griggs@uk.ibm.com> Bethany Griggs <Bethany.Griggs@uk.ibm.com>
+Beth Griggs <Bethany.Griggs@uk.ibm.com> Bethany N Griggs <Bethany.Griggs@uk.ibm.com>
+Beth Griggs <Bethany.Griggs@uk.ibm.com> BethGriggs <Bethany.Griggs@uk.ibm.com>
 Brad Decker <bhdecker84@gmail.com> brad-decker <bhdecker84@gmail.com>
 Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
 Brandon Kobel <kobelb@gmail.com> kobelb <brandon.kobel@elastic.co>
+Brendan Ashworth <brendan.ashworth@me.com> <squirrelslikeacorns@gmail.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Caleb Boyd <caleb.boyd@gmail.com>
+Calvin Metcalf <calvin.metcalf@gmail.com> <calvin.metcalf@state.ma.us>
+Calvin Metcalf <calvin.metcalf@gmail.com> <cmetcalf@appgeo.com>
 Charles <ineedpracticing@gmail.com> <cydjudge@users.noreply.github.com>
 Chew Choon Keat <choonkeat@gmail.com>
 Charles Rudolph <charles.rudolph@originate.com>
@@ -37,6 +47,7 @@ Claudio Rodriguez <cjrodr@yahoo.com> <cr@fansworld.tv>
 Colin Ihrig <cjihrig@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
 Dan Kaplun <dbkaplun@gmail.com> <dan@beardtree.com>
+Dan Williams <dan@igniter.com> Dan.Williams <daniel@chat.za.net>
 Daniel Berger <code+node@dpbis.net>
 Daniel Chcouri <333222@gmail.com>
 Daniel Gröber <darklord@darkboxed.org>
@@ -56,35 +67,46 @@ EungJun Yi <semtlenori@gmail.com>
 Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
 Evan Lucas <evanlucas@me.com> <evan@btc.com>
 Evan Lucas <evanlucas@me.com> <evan.lucas@help.com>
+FangDun Cai <cfddream@gmail.com> Fangdun Cai (Fundon) <cfddream@gmail.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
 Fedor Indutny <fedor@indutny.com> <fedor.indutny@gmail.com>
 Felix Böhm <felixboehm55@googlemail.com> <me@feedic.com>
 Felix Geisendörfer <felix@debuggable.com>
 Felix Geisendörfer <felix@debuggable.com>
+Forrest L Norvell <forrest@npmjs.com> <ogd@aoaioxxysz.net>
 Friedemann Altrock <frodenius@gmail.com>
 Fuji Goro <gfuji@cpan.org>
 Gabriel de Perthuis <g2p.code@gmail.com>
+Gibson Fahnestock <gibfahn@gmail.com> <gib@uk.ibm.com>
 Gil Pedersen <git@gpost.dk> <github@gpost.dk>
+Greg Sabia Tucker <greg@narrowlabs.com> <greg@tucke.rs>
+Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
 Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
 Igor Soarez <igorsoarez@gmail.com>
 Igor Zinkovsky <igorzi@microsoft.com>
 Imran Iqbal <imran@imraniqbal.org>
+Ionică Bizău <bizauionica@gmail.com> <bizauionica@yahoo.com>
 Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
+Italo A. Casas <me@italoacasas.com> <italo@italoacasas.com>
+Jackson Tian <shvyo1987@gmail.com> <puling.tyq@alibaba-inc.com>
 Jake Verbaten <raynos2@gmail.com>
 James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
 James M Snell <jasnell@gmail.com>
 Jan Krems <jan.krems@gmail.com> <jan.krems@groupon.com>
+Jenna Vuong <jennavuong@gmail.com> <hello@jennavuong.com>
 Jered Schmidt <tr@nslator.jp>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
 Jerry Chin <qinjia@outlook.com>
+Jesús Leganés-Combarro 'piranna <piranna@gmail.com> Jesús Leganés Combarro "piranna <piranna@gmail.com>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
 Johann Hofmann <git@johann-hofmann.com>
 John Barboza <jbarboza@ca.ibm.com> jBarz <jBarz@users.noreply.github.com>
+Johnny Ray Austin <johnny@johnnyray.me> Johnny Ray <http://johnnyray.me>
 Jon Tippens <jwtippens@gmail.com> legalcodes <jwtippens@gmail.com>
 Jonas Pfenniger <jonas@pfenniger.name> <jonas@stvs.ch>
 Jonathan Ong <jonathanrichardong@gmail.com> <jonathanong@users.noreply.github.com>
@@ -108,13 +130,13 @@ Kris Kowal <kris.kowal@cixar.com>
 Kyle Robinson Young <kyle@dontkry.com>
 Luke Bayes <lbayes@patternpark.com>
 Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
-Malte-Thorben Bruns <skenqbx@gmail.com>
-Malte-Thorben Bruns <skenqbx@googlemail.com>
+Malte-Thorben Bruns <skenqbx@gmail.com> <skenqbx@googlemail.com>
 Marcin Cieślak <saper@marcincieslak.com>
 Marcin Cieślak <saper@marcincieslak.com> <saper@saper.info>
 Marcin Zielinski <marzelin@gmail.com> marzelin <marzelin@gmail.com>
 Marti Martz <thalamew@q.com>
 Martial James Jefferson <martial.jefferson@gmail.com>
+Mathias Buus <mathiasbuus@gmail.com> <m@ge.tt>
 Mathias Pettersson <mape@mape.me>
 Matthew Lye <muddletoes@hotmail.com>
 Michael Bernstein <michaelrbernstein@gmail.com>
@@ -125,6 +147,8 @@ Micleusanu Nicu <micnic90@gmail.com>
 Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
 Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
 Mitar Milutinovic <mitar.git@tnode.com>
+Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
+Myles Borins <myles.borins@gmail.com> <mylesborins@google.com>
 Nebu Pookins<nebu@nebupookins.net>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
 Nikolai Vavilov <vvnicholas@gmail.com>
@@ -136,9 +160,12 @@ Ratikesh Misra <ratikesh92@gmail.com>
 Ray Morgan <rmorgan@zappos.com>
 Ray Solomon <raybsolomon@gmail.com>
 Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
+Rebecca Turner <me@re-becca.org> <rebecca@npmjs.com>
+Refael Ackermann <refack@gmail.com> <refael@empeeric.com>
 Reza Akhavan <reza@akhavan.me> jedireza <reza@akhavan.me>
 Ricardo Sánchez Gregorio <me@richnologies.io> richnologies <me@richnologies.io>
 Rick Olson <technoweenie@gmail.com>
+Rod Machen <rod.machen@help.com> <mail@rodmachen.com>
 Roman Klauke <romaaan.git@gmail.com> <romankl@users.noreply.github.com>
 Roman Reiss <me@silverwind.io>
 Ron Korving <ron@ronkorving.nl> <rkorving@wizcorp.jp>
@@ -152,18 +179,24 @@ Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
 Sambasiva Suda <sambasivarao@gmail.com>
 Sam Roberts <vieuxtech@gmail.com> <sam@strongloop.com>
 San-Tai Hsu <v@fatpipi.com>
+Santiago Gimeno <santiago.gimeno@gmail.com> <santiago.gimeno@ionide.es>
 Scott Blomquist <github@scott.blomqui.st> <sblom@microsoft.com>
+Segu Riluvan <rilwan22@hotmail.com> <riluvan@gmail.com>
 Sergey Kryzhanovsky <skryzhanovsky@gmail.com> <another@dhcp199-223-red.yandex.net>
 Shannen Saez <shannenlaptop@gmail.com>
-Shigeki Ohtsu <ohtsu@d.jp> <ohtsu@iij.ad.jp> <ohtsu@ohtsu.org>
+Shigeki Ohtsu <ohtsu@ohtsu.org> <ohtsu@iij.ad.jp>
+Shigeki Ohtsu <ohtsu@ohtsu.org> <ohtsu@d.jp>
 Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
 Simon Willison <simon@simonwillison.net>
 Stanislav Opichal <opichals@gmail.com>
 Stefan Budeanu <stefan@budeanu.com>
 Stefan Bühler <stbuehler@web.de>
-Steve Mao <maochenyan@msn.com>
-Steven R. Loomis <srl@icu-project.org> <srloomis@us.ibm.com>
+Steve Mao <maochenyan@gmail.com> <maochenyan@msn.com>
+Steven R. Loomis <srloomis@us.ibm.com> <srl@icu-project.org>
+Stewart X Addison <sxa@uk.ibm.com> Stewart Addison <sxa@uk.ibm.com>
+Stewart X Addison <sxa@uk.ibm.com> sxa555 <sxa@uk.ibm.com>
 Suramya shah <shah.suramya@gmail.com> ss22ever <ss22ever@users.noreply.github.com>
+Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in> <thinkbigtanu@gmail.com>
 Toby Stableford <tobytronics@gmail.com> toboid <toboid@users.noreply.github.com>
 Todd Kennedy <todd@selfassembled.org> <toddself@users.noreply.github.com>
 TJ Holowaychuk <tj@vision-media.ca>
@@ -180,6 +213,7 @@ Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.com>
 Timothy Leverett <zzzzBov@gmail.com> Timothy <zzzzBov@gmail.com>
 Tom Hughes <tom.hughes@palm.com> <tomtheengineer@gmail.com>
 Tom Hughes-Croucher <tom_croucher@yahoo.com>
+Travis Meisenheimer <travis@indexoutofbounds.com> <tmeisenh@gmail.com>
 Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
 Viktor Karpov <viktor.s.karpov@gmail.com> vitkarpov <viktor.s.karpov@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 0d445f80553de5..44340c2dd20fe4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -181,7 +181,7 @@ Ryan Petrello <lists@ryanpetrello.com>
 Fuji Goro <gfuji@cpan.org>
 Siddharth Mahendraker <siddharth_mahen@hotmail.com>
 Dave Pacheco <dap@joyent.com>
-Mathias Buus <m@ge.tt>
+Mathias Buus <mathiasbuus@gmail.com>
 Henry Rawas <henryr@schakra.com>
 Yoshihiro KIKUCHI <yknetg@gmail.com>
 Brett Kiefer <kiefer@gmail.com>
@@ -196,7 +196,7 @@ Jeremy Selier <jeremy@jolicloud.com>
 Igor Zinkovsky <igorzi@microsoft.com>
 Kip Gebhardt <kip.gebhardt@voxer.com>
 Stefan Rusu <saltwaterc@gmail.com>
-Shigeki Ohtsu <ohtsu@d.jp>
+Shigeki Ohtsu <ohtsu@ohtsu.org>
 Wojciech Wnętrzak <w.wnetrzak@gmail.com>
 Devon Govett <devongovett@gmail.com>
 Steve Engledow <steve.engledow@proxama.com>
@@ -317,7 +317,7 @@ Domenic Denicola <domenic@domenicdenicola.com>
 Joshua S. Weinstein <josher19@users.sf.net>
 Dane Springmeyer <dane@dbsgeo.com>
 Erik Dubbelboer <erik@dubbelboer.com>
-Malte-Thorben Bruns <skenqbx@googlemail.com>
+Malte-Thorben Bruns <skenqbx@gmail.com>
 Michael Thomas <aelmalinka@gmail.com>
 Garen Torikian <gjtorikian@gmail.com>
 EungJun Yi <semtlenori@gmail.com>
@@ -471,7 +471,7 @@ David Björklund <david.bjorklund@gmail.com>
 Dav Glass <davglass@gmail.com>
 Andrew Chilton <andychilton@gmail.com>
 Antony Bailey <support@antonybailey.net>
-Forrest L Norvell <ogd@aoaioxxysz.net>
+Forrest L Norvell <forrest@npmjs.com>
 Evan Solomon <evan@evanalyze.com>
 Eran Hammer <eran@hueniverse.com>
 Matthias Bartelmeß <mba@fourplusone.de>
@@ -484,7 +484,6 @@ Duan Yao <duanyao@ustc.edu>
 Matthew Aynalem <maynalem@gmail.com>
 Vsevolod Strukchinsky <floatdrop@yandex-team.ru>
 Jay Beavers <jay@hikinghomeschoolers.org>
-Mathias Buus <mathiasbuus@gmail.com>
 Eric Schrock <Eric.Schrock@delphix.com>
 Jeff Switzer <git@skratchdot.com>
 Glen Mailer <glenjamin@gmail.com>
@@ -530,7 +529,6 @@ Keith M Wesolowski <wesolows@joyent.com>
 Maxime Quandalle <maxime.quandalle@gmail.com>
 Oguz Bastemur <obastemur@gmail.com>
 Yuriy Nemtsov <nemtsov@gmail.com>
-Benjamin Waters <ben25890@gmail.com>
 iamdoron <doronpagot@gmail.com>
 Austin Moran <moraustin@gmail.com>
 Kenan Sulayman <kenan@sly.mn>
@@ -555,19 +553,16 @@ William Bert <william@spanishdict.com>
 goussardg <guillaume.goussard@mgo.com>
 Geir Hauge <geir.hauge@ntnu.no>
 Farrin Reid <blakmatrix@gmail.com>
-Ben Noordhuis <ben@strongloop.com>
 Denys Zariaiev <denys.zariaiev@gmail.com>
 Sean McArthur <sean.monstar@gmail.com>
 Rasmus Christian Pedersen <zerhacken@yahoo.com>
-Forrest L Norvell <forrest@npmjs.com>
 Adrian Lang <mail@adrianlang.de>
 Feross Aboukhadijeh <feross@feross.org>
 Refael Ackermann <refack@gmail.com>
 Taojie <taojie.hjp@taobao.com>
-Greg Sabia Tucker <greg@tucke.rs>
+Greg Sabia Tucker <greg@narrowlabs.com>
 Dan Kaplun <dbkaplun@gmail.com>
 Colin Ihrig <cjihrig@gmail.com>
-Greg Sabia Tucker <greg@narrowlabs.com>
 Mark Stosberg <mark@rideamigos.com>
 Calvin Metcalf <calvin.metcalf@gmail.com>
 Ryan Cole <ryan@rycole.com>
@@ -585,8 +580,7 @@ Jan Krems <jan.krems@gmail.com>
 Fred K. Schott <fschott@box.com>
 Chris Dickinson <christopher.s.dickinson@gmail.com>
 Jonathan Reem <jonathan.reem@gmail.com>
-Refael Ackermann <refael@empeeric.com>
-Ionică Bizău <bizauionica@yahoo.com>
+Ionică Bizău <bizauionica@gmail.com>
 Eli Skeggs <skeggse@gmail.com>
 Andrius Bentkus <andrius.bentkus@gmail.com>
 Ed Umansky <edumansky@gmail.com>
@@ -604,7 +598,7 @@ Ezequiel Rabinovich <erabinovich@gmail.com>
 Cheng Zhao <zcbenz@gmail.com>
 Tristan Berger <tristan.berger@gmail.com>
 Isaac Burns <isaacburns@gmail.com>
-Jesús Leganés Combarro "piranna <piranna@gmail.com>
+Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
 Majid Arif Siddiqui <me@majidarif.com>
 Trevor Livingston <trlivingston@paypal.com>
 Mathias Schreck <schreck.mathias@googlemail.com>
@@ -622,21 +616,19 @@ gyson <eilian.yunsong@gmail.com>
 Steve Sharp <stevenson.sharp@gmail.com>
 Victor Widell <victor@topmost.se>
 Evan Rutledge Borden <evan.borden@skedge.me>
-Johnny Ray <http://johnnyray.me>
-Steve Mao <maochenyan@msn.com>
+Johnny Ray Austin <johnny@johnnyray.me>
+Steve Mao <maochenyan@gmail.com>
 Stiliyan Lazarov <stiliyanlazarov@gmail.com>
 Wang Xinyong <wang.xy.chn@gmail.com>
 Ray Donnelly <mingw.android@gmail.com>
 dead-horse <dead_horse@qq.com>
 Luis Reis <luis.m.reis@gmail.com>
-Jackson Tian <puling.tyq@alibaba-inc.com>
 sudodoki <smd.deluzion@gmail.com>
 Steven Loomis <srl@icu-project.org>
 haoxin <coderhaoxin@outlook.com>
 Artur Cistov <artchistov@gmail.com>
 MK Safi <msafi@msafi.com>
 Rory Bradford <roryrjb@gmail.com>
-Calvin Metcalf <cmetcalf@appgeo.com>
 Nathan Woltman <nwoltman@outlook.com>
 James Cowgill <james410@cowgill.org.uk>
 Jamund Ferguson <jamund@gmail.com>
@@ -646,7 +638,7 @@ Carlos Campderrós <carlos.campderros@eyeos.com>
 Leonardo Balter <leonardo.balter@gmail.com>
 Bryce Kahle <bkahle@gmail.com>
 The Gitter Badger <badger@gitter.im>
-Brendan Ashworth <squirrelslikeacorns@gmail.com>
+Brendan Ashworth <brendan.ashworth@me.com>
 Jose Luis Rivas <me@ghostbar.co>
 Evan Lucas <evanlucas@me.com>
 Vincent Weevers <mail@vincentweevers.nl>
@@ -656,7 +648,7 @@ Juanjo <juanjo@bitrock.com>
 brian m. carlson <sandals@crustytoothpaste.net>
 Kevin O'Hara <kevinohara80@gmail.com>
 Micleusanu Nicu <micnic90@gmail.com>
-Alejandro Oviedo <alejandro.oviedo.g@gmail.com>
+Alejandro Oviedo Garcia <alejandro.oviedo.g@gmail.com>
 Ben Burns <benjamin.c.burns@gmail.com>
 Julian Duque <julianduquej@gmail.com>
 teppeis <teppeis@gmail.com>
@@ -665,7 +657,6 @@ Tim Ruffles <oi@truffles.me.uk>
 CGavrila <cristi_gavrila1@yahoo.com>
 Aleksey Smolenchuk <aleksey@uber.com>
 Caitlin Potter <caitpotter88@gmail.com>
-Calvin Metcalf <calvin.metcalf@state.ma.us>
 Eric Mill <eric@konklone.com>
 pkcs <pkcs@gmx.com>
 James M Snell <jasnell@gmail.com>
@@ -678,7 +669,7 @@ Rui Marinho <rpm@seegno.com>
 Jesse cogollo <cogollo87@gmail.com>
 Chris Alley <chris@chrisalley.info>
 Michal Tehnik <michal.tehnik@mictech.cz>
-Aaron Bieber <deftly@gmail.com>
+Aaron Bieber <aaron@bolddaemon.com>
 Phil Hughes <me@iamphill.com>
 Jongyeol Choi <jongyeol.choi@gmail.com>
 Brenard Cubacub <bcbcb@users.noreply.github.com>
@@ -692,11 +683,9 @@ Todd Kennedy <todd@selfassembled.org>
 Icer Liang <liangshuangde@163.com>
 Stephen Belanger <admin@stephenbelanger.com>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
-Brendan Ashworth <brendan.ashworth@me.com>
 Andres Suarez <zertosh@gmail.com>
 Jonathan Ong <jonathanrichardong@gmail.com>
 ttrfwork <anton.kazmerchuk@gmail.com>
-Johnny Ray Austin <johnny@johnnyray.me>
 Mathias Küsel <mathiask@hotmail.de>
 Qasim Zaidi <qasim@zaidi.me>
 Sam Newman <newmansam@outlook.com>
@@ -727,7 +716,6 @@ h7lin <i@h7lin.com>
 Michael Dawson <michael_dawson@ca.ibm.com>
 Ruben Verborgh <ruben@verborgh.org>
 Ken Perkins <ken.perkins@rackspace.com>
-Malte-Thorben Bruns <skenqbx@gmail.com>
 Santiago Gimeno <santiago.gimeno@gmail.com>
 Ali Ijaz Sheikh <ofrobots@google.com>
 FangDun Cai <cfddream@gmail.com>
@@ -792,7 +780,6 @@ Anne-Gaelle Colom <coloma@wmin.ac.uk>
 Oleksandr Chekhovskyi <oleksandr.chekhovskyi@hansoft.com>
 Tristian Flanagan <tflanagan@datacollaborative.com>
 Mike Tunnicliffe <mike.tunnicliffe@uk.ibm.com>
-Ionică Bizău <bizauionica@gmail.com>
 Danny Nemer <hi@dannynemer.com>
 Sven Slootweg <jamsoftgamedev@gmail.com>
 Dmitry Vasilyev <vaseker@gmail.com>
@@ -811,7 +798,7 @@ Charles Rudolph <charles.rudolph@originate.com>
 Dave Eddy <dave@daveeddy.com>
 Justin Chase <justin@evolvelabs.com>
 Jeremy Whitlock <jwhitlock@apache.org>
-Rod Machen <mail@rodmachen.com>
+Rod Machen <rod.machen@help.com>
 Martial James Jefferson <martial.jefferson@gmail.com>
 Doug Shamoo <doug.shamoo@gmail.com>
 Junliang Yan <jyan@ca.ibm.com>
@@ -822,7 +809,7 @@ David Boivin <dave.a.boivin@gmail.com>
 Liang-Chi Hsieh <viirya@appier.com>
 Timothy Gu <timothygu99@gmail.com>
 Fábio Santos <fabiosantosart@gmail.com>
-Myles Borins <mborins@us.ibm.com>
+Myles Borins <myles.borins@gmail.com>
 Jonas Dohse <jonas@dohse.ch>
 Коренберг Марк <mark@ideco.ru>
 Caleb Boyd <caleb.boyd@gmail.com>
@@ -862,7 +849,6 @@ Luigi Pinca <luigipinca@gmail.com>
 Peter A. Bigot <pab@pabigot.com>
 Zirak <zirakertan@gmail.com>
 Scott Buchanan <sbuchanan@ebay.com>
-Rebecca Turner <rebecca@npmjs.com>
 Bryce Baril <bryce@ravenwall.com>
 Super Zheng <superzheng@tencent.com>
 Rafał Pocztarski <r.pocztarski@gmail.com>
@@ -903,7 +889,6 @@ Julien Waechter <julien.waechter@gmail.com>
 Vitor Cortez <vitoracortez+github@gmail.com>
 Michael Theriot <michael.lee.theriot@gmail.com>
 Peter Geiss <peter.w.geiss@gmail.com>
-Santiago Gimeno <santiago.gimeno@ionide.es>
 Richard Lau <riclau@uk.ibm.com>
 José Moreira <jose.moreira@findhit.com>
 Tom Atkinson <atkinson.tommy@nsoft.ba>
@@ -911,14 +896,13 @@ Glen Arrowsmith <glen.arrowsmith@gmail.com>
 Jeff Harris <techjeffharris@gmail.com>
 Alexander Makarenko <estliberitas@gmail.com>
 Drew Folta <drew@folta.net>
-Myles Borins <myles.borins@gmail.com>
 Jimb Esser <wasteland@gmail.com>
 Dmitriy Lazarev <wKich@users.noreply.github.com>
 Adam Langley <agl@google.com>
 Kári Tristan Helgason <kthelgason@gmail.com>
 Manuel Valls <manolo@vlrz.es>
 Prayag Verma <prayag.verma@gmail.com>
-Gibson Fahnestock <gib@uk.ibm.com>
+Gibson Fahnestock <gibfahn@gmail.com>
 Alan Cohen <alan@ripple.com>
 Christophe Naud-Dulude <christophe.naud.dulude@gmail.com>
 Matthias Bastian <dev@matthias-bastian.de>
@@ -951,7 +935,6 @@ Daniel Wang <wangyang0123@gmail.com>
 Craig Akimoto <strawbrary@users.noreply.github.com>
 Michael Barrett <mike182uk@gmail.com>
 Alexander Marchenko <axvmindaweb@gmail.com>
-Steve Mao <maochenyan@gmail.com>
 Robert C Jensen <robert.cole.jensen@gmail.com>
 Vaibhav <vaibhavbansal1993@gmail.com>
 Stefano Vozza <svozza@gmail.com>
@@ -1000,7 +983,7 @@ Eric Phetteplace <phette23@gmail.com>
 William Luo <toyota790@gmail.com>
 Siobhan O'Donovan <siobhan@justshiv.com>
 Kevin Donahue <kevindonahuedevelopment@gmail.com>
-Jenna Vuong <hello@jennavuong.com>
+Jenna Vuong <jennavuong@gmail.com>
 Anchika Agarwal <anchika.agarwal@gmail.com>
 Jean Regisser <jean.regisser@gmail.com>
 Fangshi He <hefangshi@gmail.com>
@@ -1054,7 +1037,7 @@ Joran Siu <joransiu@ca.ibm.com>
 Vitaly Tomilov <vitaly-t@users.noreply.github.com>
 Ratikesh Misra <ratikesh92@gmail.com>
 Alex Perkins <aperkin@rei.com>
-Bethany N Griggs <Bethany.Griggs@uk.ibm.com>
+Beth Griggs <Bethany.Griggs@uk.ibm.com>
 Joe Esposito <joe@joeyespo.com>
 Erin Spiceland <yes@erin.codes>
 Ravindra Barthwal <ravindrabarthwal@users.noreply.github.com>
@@ -1088,7 +1071,6 @@ Angel Stoyanov <atstojanov@gmail.com>
 Thomas Hunter II <me@thomashunter.name>
 Christopher Dunavan <github@hypersprite.com>
 Peter Ogilvie <code@ogilvie.us.com>
-Dan.Williams <daniel@chat.za.net>
 Teddy Katz <teddy.katz@gmail.com>
 Kalman Hazins <kalmanh@gmail.com>
 Ltrlg <ltrlg.wp@gmail.com>
@@ -1113,7 +1095,6 @@ Wietse Venema <wvenema@xebia.com>
 Jonathan Prince <jonathan.prince@gmail.com>
 Fikret Burak Gazioglu <burakgazi@static.ip-217-149-135-181.signet.nl>
 delvedor <tommydelved@gmail.com>
-Shigeki Ohtsu <ohtsu@ohtsu.org>
 Jermaine Oppong <jeropp00@gmail.com>
 Richard Walker <digitalsadhu@gmail.com>
 matzavinos <matzavinos@workable.com>
@@ -1121,7 +1102,6 @@ Alfred Cepeda <AlfredJCepeda@gmail.com>
 Niklas Ingholt <niklas@ingholt.com>
 Michael-Rainabba Richardson <rainabba@gmail.com>
 oogz <oogz@users.noreply.github.com>
-Fangdun Cai (Fundon) <cfddream@gmail.com>
 Rene Weber <weber.rene@live.de>
 Lauren Spiegel <lhspiegel@gmail.com>
 Lydia Katsamberis <llkats@gmail.com>
@@ -1132,7 +1112,7 @@ Marc-Aurèle DARCHE <ma.darche@cynode.org>
 fen <jonairl@icloud.com>
 Christopher Fujino <christopherfujino@gmail.com>
 Richard Hong <rich.hong@gmail.com>
-Akito Ito <akito_ito@r.recruit.co.jp>
+Akito Ito <akito0107@gmail.com>
 Lydia Kats <llkats@gmail.com>
 Madhav Gharmalkar <gharmalkar.madhav@gmail.com>
 Mike Woods <mikeswoods@gmail.com>
@@ -1152,7 +1132,7 @@ Juan Andres Andrango <andrango.juanandres@gmail.com>
 larissayvette <larissayvette55@gmail.com>
 jessicaquynh <jessica.quynh.tran@gmail.com>
 Ilya Frolov <ilfroloff@gmail.com>
-Tanuja-Sawant <thinkbigtanu@gmail.com>
+Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in>
 Bradley T. Hughes <bradleythughes@fastmail.fm>
 solebox <solekiller@gmail.com>
 John Vilk <jvilk@cs.umass.edu>
@@ -1163,18 +1143,14 @@ Indrek Ardel <indrek@ardel.eu>
 Parambir Singh <parambirs@gmail.com>
 maasencioh <maasencioh@gmail.com>
 Niels Nielsen <niels@protectwise.com>
-Rod Machen <rod.machen@help.com>
 Marc Udoff <udoff@deshaw.com>
 Oliver Salzburg <oliver.salzburg@gmail.com>
 Jeena Lee <ijeenalee@gmail.com>
-BethGriggs <Bethany.Griggs@uk.ibm.com>
 Deverick <deverick@me.com>
 anu0012 <anurag30671371@gmail.com>
-Alejandro Oviedo Garcia <alejandro.oviedo.g@gmail.com>
 jseagull <jseagull@aliyun.com>
 Olan Byrne <obyrne@turnitin.com>
 Emanuele DelBono <emanuele@codiceplastico.com>
-Aaron Bieber <aaron@bolddaemon.com>
 Gerges Beshay <gerges@beshay.xyz>
 Isobel Redelmeier <iredelmeier@gmail.com>
 Brandon Kobel <kobelb@gmail.com>
@@ -1202,8 +1178,6 @@ Daijiro Yamada <yamad@daiji.ro>
 Kelvin Jin <kelvinjin@google.com>
 Mitsuo Utano <utano320@gmail.com>
 masashi.g <masashi.g@gmail.com>
-Bethany Griggs <Bethany.Griggs@uk.ibm.com>
-Italo A. Casas <italo@italoacasas.com>
 Kenneth Skovhus <kenneth.skovhus@gmail.com>
 Aaron Petcoff <hello@aaronpetcoff.me>
 Rahat Ahmed <rahatarmanahmed@gmail.com>
@@ -1251,7 +1225,7 @@ Harish Tejwani <harish@wizni.com>
 Jonathan Darling <jmdarling@me.com>
 JDHarmon <jason@jdharmon.com>
 bjdelro <brendandelrosario@gmail.com>
-Hitesh Kanwathirtha <digitalinfinity@gmail.com>
+Hitesh Kanwathirtha <hiteshk@microsoft.com>
 davidmarkclements <david.clements@nearform.com>
 Cesar Hernandez <chernandez@xogrp.com>
 Konstantin Likhter <konstantin@likhter.ru>
@@ -1308,7 +1282,6 @@ Sam Shull <sam+github@samshull.com>
 Michael-Bryant Choa <mbchoa@gmail.com>
 CodeVana <codevaana@gmail.com>
 Daniel Sims <danielsims@quickenloans.com>
-Jenna Vuong <jennavuong@gmail.com>
 Rob Adelmann <robadelmann@gmail.com>
 Diego Paez <paez.di@gmail.com>
 Paul Graham <paul@bytefair.com>
@@ -1339,19 +1312,17 @@ Joe Doyle <joe@joedoyle.us>
 Bill Ticehurst <billti@hotmail.com>
 misterpoe <raymondksi@gmail.com>
 Emanuel Buholzer <contact@emanuelbuholzer.com>
-Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in>
 Duy Le <dle@walmartlabs.com>
 Neeraj Sharma <nitsnwits@gmail.com>
 Ashita Nagesh <ashita.nagesh@gmail.com>
 Jason Wohlgemuth <jhwohlgemuth@gmail.com>
-Segu Riluvan <riluvan@gmail.com>
+Segu Riluvan <rilwan22@hotmail.com>
 Emanuel Buholzer <EmanuelBuholzer@outlook.com>
 Avery, Frank <FrankAvery@quickenloans.com>
 Chase Starr <chasestarr@gmail.com>
 sivaprasanna <sivaprasanna@gmail.com>
 Troy Connor <troy0820@users.noreply.github.com>
 Wallace Zhang <zhangwnn1@gmail.com>
-Segu Riluvan <rilwan22@hotmail.com>
 Rico Cai <rico@yunkon.com>
 Kevin Cox <kevin@wscon.com>
 Brian Chirgwin <bchirgwin@yahoo.com>
@@ -1363,16 +1334,13 @@ malen <malenesok007@yahoo.com>
 Kailean Courtney <kailean@gmail.com>
 sarahmeyer <sarahsaltrick@gmail.com>
 Fumiya KARASAWA <krswfmy@gmail.com>
-Jesús Leganés-Combarro 'piranna <piranna@gmail.com>
 John Barboza <jbarboza@ca.ibm.com>
 Paul Graham <homosaur@gmail.com>
 Nate <nfoxley@stedwards.edu>
 Chris Story <storytimesolutions@gmail.com>
 Stewart X Addison <sxa@uk.ibm.com>
 Matthew Garrett <mjg59@coreos.com>
-Hitesh Kanwathirtha <hiteshk@microsoft.com>
 David Goussev <dgoussev@gmail.com>
-Beth Griggs <Bethany.Griggs@uk.ibm.com>
 George Adams <george.adams@uk.ibm.com>
 Benedikt Meurer <bmeurer@google.com>
 Kai Cataldo <kaicataldo@gmail.com>
@@ -1395,21 +1363,17 @@ Sumit Goel <sumit@goel.pw>
 stefan judis <stefanjudis@gmail.com>
 Mark <mail.ormark@gmail.com>
 Jessica Quynh Tran <jessica.quynh.tran@gmail.com>
-Travis Meisenheimer <tmeisenh@gmail.com>
+Travis Meisenheimer <travis@indexoutofbounds.com>
 Vinícius do Carmo <vinicius.m.do.carmo@gmail.com>
 Birunthan Mohanathas <birunthan@mohanathas.com>
-John Barboza <jbarboza@ca.ibm.com>
 Ricardo Sánchez Gregorio <me@richnologies.io>
 Jon Tippens <jwtippens@gmail.com>
-Travis Meisenheimer <travis@indexoutofbounds.com>
 Aashil Patel <aashilpatel1993@gmail.com>
 Alex Ling <hkalexling@gmail.com>
 Peter Mescalchin <peter@magnetikonline.com>
 Joshua Colvin <joshua@joshuacolvin.net>
-Yuta Hiroto <git@about-hiroppy.com>
 John Maguire <jonnie.maguire@gmail.com>
 Marlena Compton <marlena.compton@gmail.com>
-Myles Borins <mylesborins@google.com>
 Gonen Dukas <gonenduk@gmail.com>
 Roee Kasher <roee@fire.glass>
 nanxiongchao <nanxiongchao@loongson.cn>
@@ -1428,7 +1392,6 @@ jobala <japheth.obala@andela.com>
 Asaf David <asafdav2@gmail.com>
 Sota Yamashita <sota.yamashita@gmail.com>
 David Benjamin <davidben@google.com>
-Akito Ito <akito0107@gmail.com>
 樋口　彰 <a_higuchi@r.recruit.co.jp>
 QianJin2013 <osexp2003@gmail.com>
 Kenan Yildirim <kenan@kenany.me>

From 3e4af6989977a74a4f9ca834f3f355bac78d61e2 Mon Sep 17 00:00:00 2001
From: Aashil Patel <aashilpatel1993@gmail.com>
Date: Sat, 15 Apr 2017 13:21:38 -0400
Subject: [PATCH 4/4] Add new authors

---
 AUTHORS | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 44340c2dd20fe4..ee864d2d8ff8db 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1405,5 +1405,15 @@ Dean Coakley <dean.s.coakley@gmail.com>
 Dmitry Tsvettsikh <dmitrycvet@gmail.com>
 Jason Wilson <jason@wilsons.io>
 Karan Thakkar <karanjthakkar@gmail.com>
+levsthings <bearnode@gmail.com>
+Howard Hellyer <hhellyer@uk.ibm.com>
+Amelia Clarke <ameliavoncat@gmail.com>
+James Ide <ide@jameside.com>
+Ben Schmidt <insightfuls@users.noreply.github.com>
+James Sumners <james.sumners@gmail.com>
+Bradley Curran <brad@bradleycurran.com>
+chiaki-yokoo <chiaki_yokoo@r.recruit.co.jp>
+Benjamin Fleischer <github@benjaminfleischer.com>
+maurice_hayward <mauricehayward1@gmail.com>
 
 # Generated by tools/update-authors.sh