diff --git a/AUTHORS b/AUTHORS
index bfc0d4e0c..10fb45c8d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,150 +8,153 @@ Tim Fischbach <mail@timfischbach.de>
 Tim Ruffles <timruffles@googlemail.com>
 Jonathan Sokolowski <jonathan.sokolowski@gmail.com>
 Domenic Denicola <domenic@domenicdenicola.com>
+William Sears <MrBigDog2U@gmail.com>
 Tim Perry <pimterry@gmail.com>
 Andreas Lind <andreas@one.com>
-William Sears <MrBigDog2U@gmail.com>
-Felix Geisendörfer <felix@debuggable.com>
-Bryan Donovan <bdondo@gmail.com>
 kpdecker <kpdecker@gmail.com>
-Keith Cirkel <github@keithcirkel.co.uk>
+Bryan Donovan <bdondo@gmail.com>
+Felix Geisendörfer <felix@debuggable.com>
+Tristan Koch <tristan.koch@1und1.de>
 Luis Cardoso <luis.cardoso@feedzai.com>
+Keith Cirkel <github@keithcirkel.co.uk>
+Andrew Gurinovich <altmind@gmail.com>
+Martin Sander <forke@uni-bonn.de>
 Tobias Ebnöther <ebi@gorn.ch>
 Cory <seeflanigan@gmail.com>
-Martin Sander <forke@uni-bonn.de>
-Andrew Gurinovich <altmind@gmail.com>
-Tristan Koch <tristan.koch@1und1.de>
-Konrad Holowinski <konrad.holowinski@gmail.com>
+zcicala <zcicala@fitbit.com>
+Marten Lienen <marten.lienen@gmail.com>
 Benjamin Coe <ben@yesware.com>
 Travis Kaufman <travis.kaufman@gmail.com>
-Marten Lienen <marten.lienen@gmail.com>
 ben fleis <ben.fleis@gmail.com>
 Garrick Cheung <garrick@garrickcheung.com>
 Gavin Huang <gravof@gmail.com>
-zcicala <zcicala@fitbit.com>
 Jonny Reeves <github@jonnyreeves.co.uk>
-Tamas Szebeni <tamas_szebeni@epam.com>
-August Lilleaas <august.lilleaas@gmail.com>
-Cormac Flynn <cormac.flynn@viadeoteam.com>
+Konrad Holowinski <konrad.holowinski@gmail.com>
 Duncan Beevers <duncan@dweebd.com>
-Garrick <gcheung@fitbit.com>
-Glen Mailer <glen.mailer@bskyb.com>
-Jason Miller <jasonmiller@synacor.com>
+Roman Potashow <justgook@gmail.com>
 Jmeas <jellyes2@gmail.com>
-Ming Liu <vmliu1@gmail.com>
+Jason Miller <jasonmiller@synacor.com>
 Robin Pedersen <robinp@snap.tv>
-Roman Potashow <justgook@gmail.com>
-Scott Andrews <scothis@gmail.com>
-Soutaro Matsumoto <matsumoto@soutaro.com>
-Thomas Meyer <meyertee@gmail.com>
+Ming Liu <vmliu1@gmail.com>
 geries <geries.handal@videoplaza.com>
-Satoshi Nakamura <snakamura@infoteria.com>
+Thomas Meyer <meyertee@gmail.com>
+Cormac Flynn <cormac.flynn@viadeoteam.com>
+Garrick <gcheung@fitbit.com>
+Tamas Szebeni <tamas_szebeni@epam.com>
+Glen Mailer <glen.mailer@bskyb.com>
+Soutaro Matsumoto <matsumoto@soutaro.com>
+August Lilleaas <august.lilleaas@gmail.com>
+Scott Andrews <scothis@gmail.com>
+Jeffrey Falgout <jfalgout@bloomberg.net>
+Alex Urbano <asgaroth.belem@gmail.com>
 Alexander Schmidt <alexanderschmidt1@gmail.com>
-Jason Karns <jason.karns@gmail.com>
-Victor Costan <costan@gmail.com>
 Brandon Heyer <brandonheyer@gmail.com>
+Devin Weaver <suki@tritarget.org>
+Farid Neshat <FaridN_SOAD@yahoo.com>
+G.Serebryanskyi <x5x3x5x@gmail.com>
+Henry Tung <henryptung@gmail.com>
+Irina Dumitrascu <me@dira.ro>
+James Barwell <jb@jamesbarwell.co.uk>
+Jason Karns <jason.karns@gmail.com>
+Jonathan Freeman <freethejazz@gmail.com>
+Josh Graham <josh@canva.com>
 Marcus Hüsgen <marcus.huesgen@lusini.com>
+Martin Hansen <martin@martinhansen.no>
+Matt Kern <matt@bloomcrush.com>
+Max Calabrese <max.calabrese@ymail.com>
 Márton Salomváry <salomvary@gmail.com>
-Jonathan Freeman <freethejazz@gmail.com>
+Patrick van Vuuren <patrick@proforto.nl>
+Satoshi Nakamura <snakamura@infoteria.com>
 Simen Bekkhus <sbekkhus91@gmail.com>
-Alex Urbano <asgaroth.belem@gmail.com>
-Irina Dumitrascu <me@dira.ro>
-yoshimura-toshihide <toshihide0105yoshimura@gmail.com>
 Spencer Elliott <me@elliottsj.com>
-Devin Weaver <suki@tritarget.org>
-なつき <i@ntk.me>
-Martin Hansen <martin@martinhansen.no>
+Victor Costan <costan@gmail.com>
+Zaal Tonia <v-ztonia@expedia.com>
 gtothesquare <me@gerieshandal.com>
-Patrick van Vuuren <patrick@proforto.nl>
-Matt Kern <matt@bloomcrush.com>
-Jeffrey Falgout <jeffrey.falgout@gmail.com>
-G.Serebryanskyi <x5x3x5x@gmail.com>
 mohayonao <mohayonao@gmail.com>
-Max Calabrese <max.calabrese@ymail.com>
-Farid Neshat <FaridN_SOAD@yahoo.com>
-James Barwell <jb@jamesbarwell.co.uk>
-Henry Tung <henryptung@gmail.com>
 vitalets <vitalets@yandex-team.ru>
-Josh Graham <josh@canva.com>
+yoshimura-toshihide <toshihide0105yoshimura@gmail.com>
+なつき <i@ntk.me>
+Lars Thorup <lars@zealake.com>
+Harry Wolff <hswolff@gmail.com>
+Marco Ramirez <marco-ramirez@bankofamerica.com>
+AJ Ortega <ajo@renitservices.com>
+Mario Pareja <mpareja@360incentives.com>
+Gyandeep Singh <gyandeeps@gmail.com>
+Martin Brochhaus <mbrochh@gmail.com>
+hashchange <heim@zeilenwechsel.de>
+Gordon L. Hempton <ghempton@gmail.com>
+jamestalmage <james.talmage@jrtechnical.com>
+Gord Tanner <gord@tinyhippos.com>
+kbackowski <kbackowski@gmail.com>
+Max Klymyshyn <klymyshyn@gmail.com>
 Michael Jackson <mjijackson@gmail.com>
 Mikolaj Banasik <d1sover@gmail.com>
-stevesouth <stephen.south@caplin.com>
+Giorgos Giannoutsos <contact@nuc.gr>
+Gilad Peleg <giladp007@gmail.com>
 Mustafa Sak <mustafa.sak@1und1.de>
+Adrian Phinney <adrian.phinney@bellaliant.net>
 Nicholas Stephan <nicholas.stephan@gmail.com>
 Nikita Litvin <deltaidea@derpy.ru>
 Niklas Andreasson <eaglus_@hotmail.com>
 Olmo Maldonado <olmo.maldonado@gmail.com>
+lucasfcosta <fernandesdacostalucas@gmail.com>
 Paul Carduner <paulcarduner@gmail.com>
-Blake Israel <blake.israel@gatech.edu>
+Gavin Boulton <gavin.boulton@digital.cabinet-office.gov.uk>
 Rajeesh C V <cvrajeesh@gmail.com>
 Raynos <raynos2@gmail.com>
 Robert Hurst <rhurst@e-xact.com>
-till <till@php.net>
 Rodion Vynnychenko <roddiku@gmail.com>
+Eric Wendelin <ewendelin@twitter.com>
 Ryan Wholey <rjwholey@gmail.com>
 wwalser <waw325@gmail.com>
+Eli White <github@eli-white.com>
 Sergio Cinos <scinos@atlassian.com>
 Shawn Krisman <skrisman@nodelings>
 Shinnosuke Watanabe <snnskwtnb@gmail.com>
+ngryman <ngryman@gmail.com>
 Simone Fonda <fonda@netseven.it>
-Gyandeep Singh <gyandeeps@gmail.com>
+Dmitriy Kubyshkin <grassator@gmail.com>
+Adam Hull <adam@hmlad.com>
+Sven Fuchs <svenfuchs@artweb-design.de>
 Søren Enemærke <soren.enemaerke@gmail.com>
 TEHEK Firefox <tehek@tehek.net>
-AJ Ortega <ajo@google.com>
+Daryl Lau <daryl@goodeggs.com>
 Tek Nynja <github@teknynja.com>
 Tim Branyen <tim@tabdeveloper.com>
+Burak Yiğit Kaya <ben@byk.im>
+Brian M Hunt <brianmhunt@gmail.com>
+Blake Israel <blake.israel@gatech.edu>
 Blake Embrey <hello@blakeembrey.com>
+Timo Tijhof <krinklemail@gmail.com>
 Blaine Bublitz <blaine@iceddev.com>
 Antonio D'Ettole <antonio@brandwatch.com>
-Timo Tijhof <krinklemail@gmail.com>
-Ali Shakiba <ali@shakiba.me>
-Alfonso Boza <alfonso@cloud.com>
+simonzack <simonzack@gmail.com>
+Andrew Michael Zammit <zammit.andrew@gmail.com>
+stevesouth <stephen.south@caplin.com>
 Volkan Ozcelik <volkan.ozcelik@jivesoftware.com>
 Will Butler <will@butlerhq.com>
 William Meleyal <w.meleyal@wollzelle.com>
-Alexander Aivars <alex@aivars.se>
+Ali Shakiba <ali@shakiba.me>
 Xiao Ma <x@medium.com>
-Alex Kessaris <alex@artsy.ca>
+till <till@php.net>
+Alfonso Boza <alfonso@cloud.com>
+Alexander Aivars <alex@aivars.se>
 charlierudolph <charles.w.rudolph@gmail.com>
+Jason Anderson <diurnalist@gmail.com>
 clint <clint@wealthfront.com>
-goligo <ich@malte.de>
-hashchange <heim@zeilenwechsel.de>
-jamestalmage <james.talmage@jrtechnical.com>
-kbackowski <kbackowski@gmail.com>
-Adrian Phinney <adrian.phinney@bellaliant.net>
-Gavin Boulton <gavin.boulton@digital.cabinet-office.gov.uk>
-Gilad Peleg <giladp007@gmail.com>
-Giorgos Giannoutsos <contact@nuc.gr>
-ngryman <ngryman@gmail.com>
-Gord Tanner <gord@tinyhippos.com>
-Gordon L. Hempton <ghempton@gmail.com>
-Sven Fuchs <svenfuchs@artweb-design.de>
-Harry Wolff <hswolff@gmail.com>
-Ian Lewis <IanMLewis@gmail.com>
-Ian Thomas <ian@ian-thomas.net>
-James Beavers <jamesjbeavers@gmail.com>
-Jan Kopriva <jan.kopriva@gooddata.com>
 Jan Suchý <jan.sandokan@gmail.com>
-Jason Anderson <diurnalist@gmail.com>
-Adam Hull <adam@hmlad.com>
-simonzack <simonzack@gmail.com>
 John Bernardo <jbernardo@linkedin.com>
-Eric Wendelin <ewendelin@twitter.com>
-Eli White <github@eli-white.com>
+Alex Kessaris <alex@artsy.ca>
+Jan Kopriva <jan.kopriva@gooddata.com>
+James Beavers <jamesjbeavers@gmail.com>
 Jordan Hawker <hawker.jordan@gmail.com>
 Joscha Feth <jfeth@atlassian.com>
 Joseph Spens <joseph@workmarket.com>
-Dmitriy Kubyshkin <grassator@gmail.com>
+goligo <ich@malte.de>
+Ian Thomas <ian@ian-thomas.net>
 Kevin Turner <kevin@decipherinc.com>
 Kim Joar Bekkelund <kjbekkelund@gmail.com>
+Ian Lewis <IanMLewis@gmail.com>
 Kris Kowal <kris.kowal@cixar.com>
 Kurt Ruppel <me@kurtruppel.com>
-Lars Thorup <lars@zealake.com>
 Luchs <Luchs@euirc.eu>
-Daryl Lau <daryl@goodeggs.com>
-Marco Ramirez <marco-ramirez@bankofamerica.com>
-Mario Pareja <mpareja@360incentives.com>
-Martin Brochhaus <mbrochh@gmail.com>
-Burak Yiğit Kaya <ben@byk.im>
-Max Klymyshyn <klymyshyn@gmail.com>
-Brian M Hunt <brianmhunt@gmail.com>
diff --git a/Changelog.txt b/Changelog.txt
index 789ce21e3..84e605b6c 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,12 @@
 
+v1.17.7 / 2016-12-31
+==================
+
+  * Fix #1026: stub watch method on object
+  * Fix invalid test for "does not walk the same property twice"
+  * Fix spying/stubbing on *etter methods
+  * restoring *etters does not invoke the getter #1124
+
 v1.17.6 / 2016-09-19
 ==================