diff --git a/AUTHORS b/AUTHORS
index 4299776e9..640712268 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,38 +16,37 @@ Andreas Lind <andreas@one.com>
 Tim Perry <pimterry@gmail.com>
 William Sears <MrBigDog2U@gmail.com>
 Mikhail Gusarov <mikhail@hola.org>
-Felix Geisendörfer <felix@debuggable.com>
 kpdecker <kpdecker@gmail.com>
 Bryan Donovan <bdondo@gmail.com>
+Felix Geisendörfer <felix@debuggable.com>
+Aleck Greenham <greenhama13@gmail.com>
+Flarna <deb2001-github@yahoo.de>
 Keith Cirkel <github@keithcirkel.co.uk>
+Tristan Koch <tristan.koch@1und1.de>
+Andrew Gurinovich <altmind@gmail.com>
 Adam Hull <adam@hmlad.com>
+Cory <seeflanigan@gmail.com>
 Tobias Ebnöther <ebi@gorn.ch>
+Luis Cardoso <luis.cardoso@feedzai.com>
 Martin Sander <forke@uni-bonn.de>
-Flarna <deb2001-github@yahoo.de>
-Andrew Gurinovich <altmind@gmail.com>
-Cory <seeflanigan@gmail.com>
 Doug Orleans <dougorleans@gmail.com>
-Aleck Greenham <greenhama13@gmail.com>
-Luis Cardoso <luis.cardoso@feedzai.com>
-Tristan Koch <tristan.koch@1und1.de>
-Gavin Huang <gravof@gmail.com>
-Jay Sherby <jaysherby@gmail.com>
 zcicala <zcicala@fitbit.com>
+Krzysztof Kaczor <chris@kaczor.io>
+Jay Sherby <jaysherby@gmail.com>
 ben fleis <ben.fleis@gmail.com>
+Viktor Zozulyak <zozulyakviktor@gmail.com>
 Konrad Holowinski <konrad.holowinski@gmail.com>
-Garrick Cheung <garrick@garrickcheung.com>
-Krzysztof Kaczor <chris@kaczor.io>
-Marten Lienen <marten.lienen@gmail.com>
-GCHQDeveloper500 <32099399+GCHQDeveloper500@users.noreply.github.com>
-Eyal Arubas <eyalarubas@gmail.com>
 Benjamin Coe <ben@yesware.com>
-Viktor Zozulyak <zozulyakviktor@gmail.com>
+Eyal Arubas <eyalarubas@gmail.com>
+Marten Lienen <marten.lienen@gmail.com>
+Garrick Cheung <garrick@garrickcheung.com>
+Gavin Huang <gravof@gmail.com>
 Travis Kaufman <travis.kaufman@gmail.com>
-Islam Sharabash <islam.sharabash@gmail.com>
+GCHQDeveloper500 <32099399+GCHQDeveloper500@users.noreply.github.com>
+Duncan Beevers <duncan@dweebd.com>
 Ming Liu <vmliu1@gmail.com>
 Dmitriy Kubyshkin <grassator@gmail.com>
 Dominykas Blyžė <hello@dominykas.com>
-Duncan Beevers <duncan@dweebd.com>
 Jmeas <jellyes2@gmail.com>
 Rae Liu <happyaray@gmail.com>
 Robin Pedersen <robinp@snap.tv>
@@ -65,53 +64,54 @@ Glen Mailer <glen.mailer@bskyb.com>
 August Lilleaas <august.lilleaas@gmail.com>
 Cormac Flynn <cormac.flynn@viadeoteam.com>
 geries <geries.handal@videoplaza.com>
+Islam Sharabash <islam.sharabash@gmail.com>
 Michael Herman <hermanmu@gmail.com>
 Spencer Elliott <me@elliottsj.com>
 Simen Bekkhus <sbekkhus91@gmail.com>
 Josh Greenberger <jdgreenberger@gmail.com>
+Devin Weaver <suki@tritarget.org>
 Josh Graham <josh@canva.com>
 Sebastian Van Sande <sebastian@vansande.org>
 Satoshi Nakamura <snakamura@infoteria.com>
-yoshimura-toshihide <toshihide0105yoshimura@gmail.com>
-Victor Costan <costan@gmail.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
+Victor Costan <costan@gmail.com>
 Evan Lloyd <evan.u.lloyd@gmail.com>
-Devin Weaver <suki@tritarget.org>
+yoshimura-toshihide <toshihide0105yoshimura@gmail.com>
 Rens Groothuijsen <l.groothuijsen@alumni.maastrichtuniversity.nl>
 Alex Urbano <asgaroth.belem@gmail.com>
 Andrzej Porebski <fkuciapa@yahoo.com>
 Jonathan Freeman <freethejazz@gmail.com>
+Gyandeep Singh <gyandeeps@gmail.com>
 Alexander Schmidt <alexanderschmidt1@gmail.com>
 Brandon Heyer <brandonheyer@gmail.com>
 blacksun1 <simon@blacksun.cx>
-Gyandeep Singh <gyandeeps@gmail.com>
 Marcus Hüsgen <marcus.huesgen@lusini.com>
 Alex Puchades <alex94puchades@gmail.com>
-なつき <i@ntk.me>
 Henry Tung <henryptung@gmail.com>
-gtothesquare <me@gerieshandal.com>
+なつき <i@ntk.me>
 Hugo Muller <hugo.muller@free.fr>
+gtothesquare <me@gerieshandal.com>
 Mark Stacey <mark.stacey@amecfw.com>
 Afnizar Nur Ghifari <afnizarnur@users.noreply.github.com>
 Elad Nachmias <theman@elad.im>
 Jimmy Shimizu <jimmy.shimizu@springworks.se>
-Jeffrey Falgout <jfalgout@bloomberg.net>
 Daniel Rey Lopez <daniel.rey.lopez@automattic.com>
-mohayonao <mohayonao@gmail.com>
+Jeffrey Falgout <jfalgout@bloomberg.net>
 Martin Hansen <martin@martinhansen.no>
+mohayonao <mohayonao@gmail.com>
 Jason Karns <jason.karns@gmail.com>
 Nathan Perry <nateperry333@gmail.com>
 Matt Kern <matt@bloomcrush.com>
 Nathan Friedly <nathan@nfriedly.com>
-Márton Salomváry <salomvary@gmail.com>
 Max Calabrese <max.calabrese@ymail.com>
+Márton Salomváry <salomvary@gmail.com>
+Chris Breiding <chrisbreiding@gmail.com>
 Irina Dumitrascu <me@dira.ro>
 Tarjei Huse <tarjei.huse@gmail.com>
-Chris Breiding <chrisbreiding@gmail.com>
 Szymon Przybylski <szymon.przybylski@gmail.com>
-vitalets <vitalets@yandex-team.ru>
 Aaron <aaron.todd@gmail.com>
 James Barwell <jb@jamesbarwell.co.uk>
+vitalets <vitalets@yandex-team.ru>
 G.Serebryanskyi <x5x3x5x@gmail.com>
 Rajeesh C V <cvrajeesh@gmail.com>
 Raul Matei <raul.matei@8x8.com>
@@ -123,6 +123,7 @@ Roland Warmerdam <roland@segment.com>
 Ryan Roemer <ryan@loose-bits.com>
 Ryan Wholey <rjwholey@gmail.com>
 STuFF <nchalleil@gmail.com>
+Scott Rudiger <scottrudiger@gmail.com>
 Sergio Cinos <scinos@atlassian.com>
 Shaine Hatch <shainehatch@overstock.com>
 Shawn Krisman <skrisman@nodelings>
diff --git a/History.md b/History.md
index 5cbc1a65d..c270d0cec 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,9 @@
 
+5.0.2 / 2018-05-01
+==================
+
+  * Reset history on sandbox reset (#1770)
+
 5.0.1 / 2018-04-27
 ==================