Merge branch 'master' into next

html/cgi-bin/credits.cgi

@@ -67,8 +67,8 @@ Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Peter Müller,
-Erik Kapfer,
 Jan Paul Tücking,
+Erik Kapfer,
 Jonatan Schlag,
 Dirk Wagner,
 Marcel Lorenz,
@@ -82,10 +82,9 @@ Stephan Feddersen,
 Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
-Stéphane Pautrel,
 Ersan Yildirim,
 Jörn-Ingo Weigert,
-Adolf Belka,
+Stéphane Pautrel,
 Alexander Koch,
 Wolfgang Apolinarski,
 Alfred Haas,
@@ -97,11 +96,11 @@ Florian Bührle,
 Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
+Adolf Belka,
 Alex Koch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
-Marcel Follert,
 Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
@@ -129,6 +128,7 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Marcel Follert,
 Markus Untersee,
 Mathew McBride,
 Nico Prenzel,