diff --git a/AUTHORS b/AUTHORS
index acf05d0ca..95fd93caf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,135 +13,93 @@ Tim Ruffles <timruffles@googlemail.com>
 Jonathan Sokolowski <jonathan.sokolowski@gmail.com>
 Andreas Lind <andreas@one.com>
 Domenic Denicola <domenic@domenicdenicola.com>
-William Sears <MrBigDog2U@gmail.com>
 Tim Perry <pimterry@gmail.com>
+William Sears <MrBigDog2U@gmail.com>
 Mikhail Gusarov <mikhail@hola.org>
 Bryan Donovan <bdondo@gmail.com>
-kpdecker <kpdecker@gmail.com>
 Felix Geisendörfer <felix@debuggable.com>
-Luis Cardoso <luis.cardoso@feedzai.com>
-Tristan Koch <tristan.koch@1und1.de>
-Martin Sander <forke@uni-bonn.de>
-Doug Orleans <dougorleans@gmail.com>
+kpdecker <kpdecker@gmail.com>
+Adam Hull <adam@hmlad.com>
 Aleck Greenham <greenhama13@gmail.com>
-Cory <seeflanigan@gmail.com>
 Andrew Gurinovich <altmind@gmail.com>
-Adam Hull <adam@hmlad.com>
-Tobias Ebnöther <ebi@gorn.ch>
+Cory <seeflanigan@gmail.com>
+Doug Orleans <dougorleans@gmail.com>
 Keith Cirkel <github@keithcirkel.co.uk>
-zcicala <zcicala@fitbit.com>
+Luis Cardoso <luis.cardoso@feedzai.com>
+Martin Sander <forke@uni-bonn.de>
+Tobias Ebnöther <ebi@gorn.ch>
+Tristan Koch <tristan.koch@1und1.de>
 Benjamin Coe <ben@yesware.com>
-Marten Lienen <marten.lienen@gmail.com>
-Travis Kaufman <travis.kaufman@gmail.com>
-ben fleis <ben.fleis@gmail.com>
-Viktor Zozulyak <zozulyakviktor@gmail.com>
 Garrick Cheung <garrick@garrickcheung.com>
 Gavin Huang <gravof@gmail.com>
 Konrad Holowinski <konrad.holowinski@gmail.com>
-Tim Costa <tcosta@2u.com>
-Islam Sharabash <islam.sharabash@gmail.com>
-Rae Liu <happyaray@gmail.com>
-Jmeas <jellyes2@gmail.com>
+Marten Lienen <marten.lienen@gmail.com>
+Travis Kaufman <travis.kaufman@gmail.com>
+Viktor Zozulyak <zozulyakviktor@gmail.com>
+ben fleis <ben.fleis@gmail.com>
+zcicala <zcicala@fitbit.com>
 August Lilleaas <august.lilleaas@gmail.com>
-Glen Mailer <glen.mailer@bskyb.com>
+Cormac Flynn <cormac.flynn@viadeoteam.com>
 Dmitriy Kubyshkin <grassator@gmail.com>
+Dominykas Blyžė <hello@dominykas.com>
 Duncan Beevers <duncan@dweebd.com>
+Florent Jaby <florent.jaby@gmail.com>
 Garrick <gcheung@fitbit.com>
-Dominykas Blyžė <hello@dominykas.com>
-Tamas Szebeni <tamas_szebeni@epam.com>
-Cormac Flynn <cormac.flynn@viadeoteam.com>
-geries <geries.handal@videoplaza.com>
-Robin Pedersen <robinp@snap.tv>
-Thomas Meyer <meyertee@gmail.com>
+Glen Mailer <glen.mailer@bskyb.com>
+Islam Sharabash <islam.sharabash@gmail.com>
+Jmeas <jellyes2@gmail.com>
 Kir Chou <note351@hotmail.com>
-Scott Andrews <scothis@gmail.com>
-Florent Jaby <florent.jaby@gmail.com>
-Soutaro Matsumoto <matsumoto@soutaro.com>
 Ming Liu <vmliu1@gmail.com>
+Rae Liu <happyaray@gmail.com>
+Robin Pedersen <robinp@snap.tv>
 Roman Potashow <justgook@gmail.com>
-なつき <i@ntk.me>
+Scott Andrews <scothis@gmail.com>
+Soutaro Matsumoto <matsumoto@soutaro.com>
+Tamas Szebeni <tamas_szebeni@epam.com>
+Thomas Meyer <meyertee@gmail.com>
+Tim Costa <tcosta@2u.com>
+geries <geries.handal@videoplaza.com>
+Aaron <aaron.todd@gmail.com>
+Afnizar Nur Ghifari <afnizarnur@users.noreply.github.com>
+Alex Urbano <asgaroth.belem@gmail.com>
+Alexander Schmidt <alexanderschmidt1@gmail.com>
+Andrzej Porebski <fkuciapa@yahoo.com>
+Brandon Heyer <brandonheyer@gmail.com>
+Chris Breiding <chrisbreiding@gmail.com>
+Daniel Rey Lopez <daniel.rey.lopez@automattic.com>
 Devin Weaver <suki@tritarget.org>
+Elad Nachmias <theman@elad.im>
+Farid Neshat <FaridN_SOAD@yahoo.com>
+G.Serebryanskyi <x5x3x5x@gmail.com>
+Gyandeep Singh <gyandeeps@gmail.com>
+Henry Tung <henryptung@gmail.com>
+Irina Dumitrascu <me@dira.ro>
 James Barwell <jb@jamesbarwell.co.uk>
-Márton Salomváry <salomvary@gmail.com>
 Jason Karns <jason.karns@gmail.com>
 Jeffrey Falgout <jeffrey.falgout@gmail.com>
 Jimmy Shimizu <jimmy.shimizu@springworks.se>
-Elad Nachmias <theman@elad.im>
 Jonathan Freeman <freethejazz@gmail.com>
-Aaron <aaron.todd@gmail.com>
+Josh Graham <josh@canva.com>
+Josh Greenberger <jdgreenb@usc.edu>
+Marcus Hüsgen <marcus.huesgen@lusini.com>
+Mark Stacey <mark.stacey@amecfw.com>
+Martin Hansen <martin@martinhansen.no>
+Matt Kern <matt@bloomcrush.com>
+Max Calabrese <max.calabrese@ymail.com>
+Márton Salomváry <salomvary@gmail.com>
 Satoshi Nakamura <snakamura@infoteria.com>
 Sebastian Van Sande <sebastian@vansande.org>
-Farid Neshat <FaridN_SOAD@yahoo.com>
-Brandon Heyer <brandonheyer@gmail.com>
-Andrzej Porebski <fkuciapa@yahoo.com>
 Simen Bekkhus <sbekkhus91@gmail.com>
 Spencer Elliott <me@elliottsj.com>
-Josh Graham <josh@canva.com>
-Josh Greenberger <jdgreenb@usc.edu>
-G.Serebryanskyi <x5x3x5x@gmail.com>
 Szymon Przybylski <szymon.przybylski@gmail.com>
-Alex Urbano <asgaroth.belem@gmail.com>
-Chris Breiding <chrisbreiding@gmail.com>
 Victor Costan <costan@gmail.com>
 blacksun1 <simon@blacksun.cx>
-Gyandeep Singh <gyandeeps@gmail.com>
-Marcus Hüsgen <marcus.huesgen@lusini.com>
-Henry Tung <henryptung@gmail.com>
 gtothesquare <me@gerieshandal.com>
-Alexander Schmidt <alexanderschmidt1@gmail.com>
-Mark Stacey <mark.stacey@amecfw.com>
-Daniel Rey Lopez <daniel.rey.lopez@automattic.com>
 mohayonao <mohayonao@gmail.com>
-Martin Hansen <martin@martinhansen.no>
-Afnizar Nur Ghifari <afnizarnur@users.noreply.github.com>
-Matt Kern <matt@bloomcrush.com>
 vitalets <vitalets@yandex-team.ru>
-Max Calabrese <max.calabrese@ymail.com>
 yoshimura-toshihide <toshihide0105yoshimura@gmail.com>
-Irina Dumitrascu <me@dira.ro>
-STuFF <nchalleil@gmail.com>
-Sergio Cinos <scinos@atlassian.com>
-Shaine Hatch <shainehatch@overstock.com>
-Shawn Krisman <skrisman@nodelings>
-Shinnosuke Watanabe <snnskwtnb@gmail.com>
-Simone Fonda <fonda@netseven.it>
-Stefan Weil <sw@weilnetz.de>
-Stefan du Fresne <stefan@sdufresne.info>
-StefanSchoof <Stefan.Schoof@direkt-gruppe.de>
-Stephen Burrows <stephen.r.burrows@gmail.com>
-Steven Lu <stevenlu443@gmail.com>
-Sven Fuchs <svenfuchs@artweb-design.de>
-Søren Enemærke <soren.enemaerke@gmail.com>
-T1st3 <contact@tiste.org>
-TEHEK Firefox <tehek@tehek.net>
-Tarjei Huse <tarjei.huse@gmail.com>
-Tek Nynja <github@teknynja.com>
-The Gitter Badger <badger@gitter.im>
-Tieme van Veen <tiemevanveen@hotmail.com>
-Tim Branyen <tim@tabdeveloper.com>
-Tim Wienk <tim@wienk.name>
-Timo Tijhof <krinklemail@gmail.com>
-Volkan Ozcelik <volkan.ozcelik@jivesoftware.com>
-Vynce Montgomery <vynce.montgomery@gmail.com>
-Will Butler <will@butlerhq.com>
+なつき <i@ntk.me>
 AJ Ortega <ajo@google.com>
-Xiao Ma <x@medium.com>
-charlierudolph <charles.w.rudolph@gmail.com>
-clint <clint@wealthfront.com>
-goligo <ich@malte.de>
-hannes <github@htmlcss.de>
-hashchange <heim@zeilenwechsel.de>
-ichthala <alice.mottola@gmail.com>
-jamestalmage <james.talmage@jrtechnical.com>
-kbackowski <kbackowski@gmail.com>
-mareq <mareq@balint.eu>
-ngryman <ngryman@gmail.com>
-simonzack <simonzack@gmail.com>
-stevesouth <stephen.south@caplin.com>
-thefourtheye <thefourtheye@users.noreply.github.com>
-till <till@php.net>
-wwalser <waw325@gmail.com>
-William Meleyal <w.meleyal@wollzelle.com>
 AdilKhn <AdilKhn@users.noreply.github.com>
 Aditya Vohra <avohra@yelp.com>
 Adrian Phinney <adrian.phinney@bellaliant.net>
@@ -176,6 +134,7 @@ Felipe Carasso <felipe@carassonet.org>
 GProst <gprostmail@gmail.com>
 Gabe Jackson <gj@mail.co.de>
 Gavin Boulton <gavin.boulton@digital.cabinet-office.gov.uk>
+George Schneeloch <gschneel@mit.edu>
 Gilad Peleg <giladp007@gmail.com>
 Giorgos Giannoutsos <contact@nuc.gr>
 Gord Tanner <gord@tinyhippos.com>
@@ -246,3 +205,45 @@ Rodion Vynnychenko <roddiku@gmail.com>
 Roland Warmerdam <roland@segment.com>
 Ryan Roemer <ryan@loose-bits.com>
 Ryan Wholey <rjwholey@gmail.com>
+STuFF <nchalleil@gmail.com>
+Sergio Cinos <scinos@atlassian.com>
+Shaine Hatch <shainehatch@overstock.com>
+Shawn Krisman <skrisman@nodelings>
+Shinnosuke Watanabe <snnskwtnb@gmail.com>
+Simone Fonda <fonda@netseven.it>
+Stefan Weil <sw@weilnetz.de>
+Stefan du Fresne <stefan@sdufresne.info>
+StefanSchoof <Stefan.Schoof@direkt-gruppe.de>
+Stephen Burrows <stephen.r.burrows@gmail.com>
+Steven Lu <stevenlu443@gmail.com>
+Sven Fuchs <svenfuchs@artweb-design.de>
+Søren Enemærke <soren.enemaerke@gmail.com>
+T1st3 <contact@tiste.org>
+TEHEK Firefox <tehek@tehek.net>
+Tarjei Huse <tarjei.huse@gmail.com>
+Tek Nynja <github@teknynja.com>
+The Gitter Badger <badger@gitter.im>
+Tieme van Veen <tiemevanveen@hotmail.com>
+Tim Branyen <tim@tabdeveloper.com>
+Tim Wienk <tim@wienk.name>
+Timo Tijhof <krinklemail@gmail.com>
+Volkan Ozcelik <volkan.ozcelik@jivesoftware.com>
+Vynce Montgomery <vynce.montgomery@gmail.com>
+Will Butler <will@butlerhq.com>
+William Meleyal <w.meleyal@wollzelle.com>
+Xiao Ma <x@medium.com>
+charlierudolph <charles.w.rudolph@gmail.com>
+clint <clint@wealthfront.com>
+goligo <ich@malte.de>
+hannes <github@htmlcss.de>
+hashchange <heim@zeilenwechsel.de>
+ichthala <alice.mottola@gmail.com>
+jamestalmage <james.talmage@jrtechnical.com>
+kbackowski <kbackowski@gmail.com>
+mareq <mareq@balint.eu>
+ngryman <ngryman@gmail.com>
+simonzack <simonzack@gmail.com>
+stevesouth <stephen.south@caplin.com>
+thefourtheye <thefourtheye@users.noreply.github.com>
+till <till@php.net>
+wwalser <waw325@gmail.com>
diff --git a/Changelog.txt b/Changelog.txt
index a4d549fdf..50a2a283f 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,12 @@
 
+3.1.0 / 2017-08-08
+==================
+
+  * Lots of documentation updates
+  * Fix regression on sandbox.stub(obj,protoMethod)
+  * Add factory functions for sandbox and fake server
+  * Add support for passing a function to stub.throws(...). (#1511)
+
 3.0.0 / 2017-08-03
 ==================