Merge branch 'master' into 2.3.0

Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t

AUTHORS

@@ -11,6 +11,7 @@ contributions of the following people:
   Wim Schuermann     (Contributing Author)
   Owen Clarke        (Contributing Author)
   Louis-Claude Canon (Contributing Author)
+  Scott Kostyshak    (Contributing Author)
 
 The following submitted code, packages or analysis, and deserve special thanks:
 
@@ -74,10 +75,16 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Oleksii Tsai
   Jörg Plate
   Markus Kuhn
-  Scott Kostyshak
   Erik Wenzel
   Štěpán Henek
   Haitham Gad
+  Fidel Mato
+  Justin Forest
+  Vincent Petithory
+  Rainer Müller
+  Jakub Wilk
+  Russell Steicke
+  YBSAR
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -159,4 +166,12 @@ suggestions:
   Jim B
   Robert Gill
   Robin Björklin
-
+  Jake Bell
+  Florian Hollerweger
+  Thomas Sullivan
+  Tim None
+  trHD
+  Benjamin Weber
+  alparo
+  Roy Zuo
+  Friedrich Heusler