Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default

# Conflicts:
#	CHANGELOG.rst
#	testing/test_terminal.py

Author: nicoddemus

.github/ISSUE_TEMPLATE.md

@@ -4,5 +4,5 @@ Here's a quick checklist in what to include:
 
 - [ ] Include a detailed description of the bug or suggestion
 - [ ] `pip list` of the virtual environment you are using
-- [ ] py.test and operating system versions
+- [ ] pytest and operating system versions
 - [ ] Minimal example if possible

.gitignore

@@ -33,3 +33,4 @@ env/
 .coverage
 .ropeproject
 .idea
+.hypothesis

AUTHORS

@@ -3,13 +3,15 @@ merlinux GmbH, Germany, office at merlinux eu
 
 Contributors include::
 
+Abdeali JK
 Abhijeet Kasurde
 Alexei Kozlenok
 Anatoly Bubenkoff
 Andreas Zeidler
 Andy Freeland
 Andrzej Ostrowski
 Anthon van der Neut
+Antony Lee
 Armin Rigo
 Aron Curzon
 Aviv Palivoda
@@ -31,6 +33,7 @@ Christopher Gilling
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
+Danielle Jenkins
 Dave Hunt
 David Díaz-Barquero
 David Mohr
@@ -62,6 +65,7 @@ John Towler
 Joshua Bronson
 Jurko Gospodnetić
 Katarzyna Jachim
+Kale Kundert
 Kevin Cox
 Lee Kamentsky
 Lukas Bednar
@@ -74,26 +78,38 @@ Martijn Faassen
 Martin Prusse
 Martin K. Scherer
 Matt Bachmann
+Matt Williams
 Michael Aquilina
 Michael Birtwell
 Michael Droettboom
+Mike Lundy
 Nicolas Delaby
+Oleg Pidsadnyi
+Oliver Bestwalter
+Omar Kohl
 Pieter Mulder
 Piotr Banaszkiewicz
 Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
 Raphael Pierzina
+Roman Bolshakov
 Ronny Pfannschmidt
 Ross Lawley
 Russel Winder
 Ryan Wooden
 Samuele Pedroni
+Steffen Allner
+Stephan Obermann
+Tareq Alayan
+Ted Xiao
 Simon Gomizelj
 Stefano Taschini
 Stefan Farmbauer
 Thomas Grainger
 Tom Viner
 Trevor Bekolay
+Vasily Kuznetsov
 Wouter van Ackooy
 Bernard Pratz
+Stefan Zimmermann