Merge branch 'cherry-pick-ee8a0013' into 'releases/3.0'

Merge branch 'update-contributors' into 'master'

See merge request !1425

LICENSE.md

@@ -6,50 +6,58 @@ Copyright holders
 
 | Year       | Name                       |
 |------------|----------------------------|
-| 2016-2017  | Sina Ackermann             |
+| 2016-2018  | Sina Ackermann             |
 | 2010-2014  | Katherina Baber            |
-| 2015-2017  | Martin Beck                |
-| 2013-2017  | Beatrix Becker             |
+| 2015-2018  | Martin Beck                |
+| 2013-2018  | Beatrix Becker             |
 | 2014       | Markus Blatt               |
 | 2010       | Felix Bode                 |
+| 2018       | Samuel Burbulla            |
 | 2007-2011  | Yufei Cao                  |
-| 2011-2016  | Holger Class               |
+| 2018       | Edward 'Ned' Coltman       |
+| 2011-2018  | Holger Class               |
 | 2008-2013  | Melanie Darcis             |
 | 2008-2009  | Onur Dogan                 |
 | 2009-2011  | Karin Erbertseder          |
 | 2009-2014  | Benjamin Faigle            |
-| 2013-2017  | Thomas Fetzer              |
-| 2007-2017  | Bernd Flemisch             |
+| 2013-2018  | Thomas Fetzer              |
+| 2007-2018  | Bernd Flemisch             |
 | 2007-2010  | Jochen Fritz               |
 | 2015-2016  | Georg Futter               |
-| 2015-2017  | Dennis Gläser              |
-| 2012-2017  | Christoph Grüninger        |
-| 2016-2017  | Katharina Heck             |
+| 2015-2018  | Dennis Gläser              |
+| 2012-2018  | Christoph Grüninger        |
+| 2016-2018  | Katharina Heck             |
 | 2017       | Rainer Helmig              |
-| 2015-2017  | Johannes Hommel            |
+| 2015-2018  | Johannes Hommel            |
 | 2012-2015  | Vishal Jambhekar           |
 | 2013-2014  | Muhammad Adil Javed        |
 | 2012-2017  | Alexander Kissinger        |
-| 2013-2017  | Timo Koch                  |
+| 2013-2018  | Timo Koch                  |
 | 2017       | Kata Kurgyis               |
+| 2018       | Theresa Kurz               |
 | 2008-2012  | Andreas Lauser             |
+| 2018       | Giuliano Lambardo          |
+| 2018       | Melanie Lipp               |
+| 2018       | Farid Mohammadi            |
 | 2008-2014  | Klaus Mosthaf              |
 | 2009-2014  | Philipp Nuske              |
 | 2014       | Mirka Papenheim            |
 | 2013-2014  | Dominik Riesterer          |
 | 2008       | Irina Rybak                |
-| 2013-2017  | Martin Schneider           |
-| 2015-2017  | Simon Scholz               |
+| 2013-2018  | Martin Schneider           |
+| 2015-2018  | Simon Scholz               |
 | 2009       | Anneli Schöniger           |
 | 2015-2016  | Natalie Schröder           |
 | 2010-2016  | Nicolas Schwenck           |
-| 2015-2017  | Gabriele Seitz             |
+| 2015-2018  | Gabriele Seitz             |
+| 2018       | Lincoln Sherpa             |
 | 2011       | Michael Sinsbeck           |
 | 2010       | Leopold Stadler            |
 | 2012-2014  | Alexandru Tatomir          |
 | 2015-2017  | Larissa de Vries           |
 | 2013       | Katharina Türk             |
 | 2010-2014  | Lena Walter                |
+| 2018       | Felix Weinhardt            |
 | 2015-2017  | Kilian Weishaupt           |
 | 2010-2011  | David Werner               |
 | 2015       | Hao Wu                     |