Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

doc/authors.md

@@ -1,68 +1,93 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (392)
-Simon Liu (254)
-Sean Bowe (185)
-Daira Hopwood (80)
+Jack Grigg (601)
+Simon Liu (297)
+Sean Bowe (193)
+Daira Hopwood (102)
+Wladimir J. van der Laan (71)
 Taylor Hornby (65)
-Wladimir J. van der Laan (58)
-Jonas Schnelli (48)
-Jay Graber (47)
+Jay Graber (61)
+Nathan Wilcox (56)
+Jonas Schnelli (49)
 Kevin Gallagher (38)
-Cory Fields (15)
-Pieter Wuille (14)
-Nathan Wilcox (10)
+Cory Fields (30)
+Pieter Wuille (24)
+syd (15)
 nomnombtc (9)
-fanquake (5)
-Paige Peterson (5)
-MarcoFalke (5)
+Paige Peterson (9)
+Matt Corallo (9)
+fanquake (8)
+MarcoFalke (7)
+Luke Dashjr (6)
 Johnathan Corgan (5)
 Gregory Maxwell (5)
+Ariel Gabizon (5)
+kozyilmaz (4)
 Philip Kaufmann (4)
 Peter Todd (4)
 Patrick Strateman (4)
-Matt Corallo (4)
 Karl-Johan Alm (4)
+Jorge Timón (4)
 Jeff Garzik (4)
 David Mercer (4)
 Daniel Cousens (4)
 lpescher (3)
+Suhas Daftuar (3)
 Pavel Janík (3)
+João Barbosa (3)
+Ariel (3)
 Alfie John (3)
+str4d (2)
 paveljanik (2)
+kpcyrd (2)
 aniemerg (2)
 Scott (2)
 Robert C. Seacord (2)
-Luke Dashjr (2)
-João Barbosa (2)
+Per Grön (2)
+Pavel Vasin (2)
 Joe Turgeon (2)
+Jason Davies (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
 Gavin Andresen (2)
+Daniel Kraft (2)
+Bjorn Hjortsberg (2)
+Amgad Abdelhafez (2)
 zathras-crypto (1)
 unsystemizer (1)
+practicalswift (1)
 mruddy (1)
 mrbandrews (1)
 kazcw (1)
+jc (1)
 isle2983 (1)
 instagibbs (1)
+emilrus (1)
 dexX7 (1)
+daniel (1)
 calebogden (1)
 ayleph (1)
 Tom Ritter (1)
 Stephen (1)
 S. Matthew English (1)
-Pavel Vasin (1)
+Ross Nicoll (1)
+René Nyffenegger (1)
 Paul Georgiou (1)
 Paragon Initiative Enterprises, LLC (1)
+Nicolas DORIER (1)
 Nathaniel Mahieu (1)
 Murilo Santana (1)
+Maxwell Gubler (1)
 Matt Quinn (1)
+Mark Friedenbach (1)
+Marius Kjærstad (1)
 Louis Nyffenegger (1)
 Leo Arias (1)
 Lars-Magnus Skog (1)
-Jorge Timón (1)
+Kevin Pan (1)
+Jonathan "Duke" Leto (1)
+Jonas Nick (1)
 Jeffrey Walton (1)
 Ian Kelling (1)
 Gaurav Rana (1)
@@ -70,17 +95,23 @@ Forrest Voight (1)
 Florian Schmaus (1)
 Ethan Heilman (1)
 Eran Tromer (1)
-Daniel Kraft (1)
+Duke Leto (1)
 Christian von Roques (1)
 Chirag Davé (1)
 Casey Rodarmor (1)
 Cameron Boehmer (1)
 Bryan Stitt (1)
+Bruno Arueira (1)
+Boris Hajduk (1)
 Bob McElrath (1)
 Bitcoin Error Log (1)
+Ashley Holman (1)
+Anthony Towns (1)
 Allan Niemerg (1)
 Alex van der Peet (1)
+Alex Morcos (1)
 Alex (1)
 Adam Weiss (1)
 Adam Brown (1)
 4ZEC (1)
+21E14 (1)