Merge branch 'pytest-dev'

# Conflicts:
#	AUTHORS

AUTHORS

@@ -3,6 +3,7 @@ merlinux GmbH, Germany, office at merlinux eu
 
 Contributors include::
 
+Abhijeet Kasurde
 Anatoly Bubenkoff
 Andreas Zeidler
 Andy Freeland
@@ -14,6 +15,7 @@ Bob Ippolito
 Brian Dorsey
 Brian Okken
 Brianna Laugher
+Bruno Oliveira
 Carl Friedrich Bolz
 Charles Cloud
 Chris Lamb
@@ -24,11 +26,12 @@ Daniel Grana
 Daniel Nuri
 Dave Hunt
 David Mohr
+Edison Gustavo Muenz
 Eduardo Schettino
 Elizaveta Shashkova
+Eric Hunsberger
 Eric Siegerman
 Florian Bruhin
-Edison Gustavo Muenz
 Floris Bruynooghe
 Graham Horler
 Grig Gheorghiu
@@ -46,6 +49,7 @@ Maciek Fijalkowski
 Maho
 Marc Schlaich
 Mark Abramowitz
+Markus Unterwaditzer
 Martijn Faassen
 Nicolas Delaby
 Pieter Mulder
@@ -58,3 +62,4 @@ Samuele Pedroni
 Tom Viner
 Trevor Bekolay
 Wouter van Ackooy
+David Díaz-Barquero