Merge pull request #475 from ibuclaw/merge_stable

merge stable

Author: ibuclaw

.mailmap

@@ -95,6 +95,7 @@ Quirin F. Schroll <qs.il.paperinik@gmail.com>
 Quirin F. Schroll <qs.il.paperinik@gmail.com> <Bolpat@users.noreply.github.com>
 Rainer Schuetze <r.sagitario@gmx.de> <r.sagitario@gmx.de>
 Razvan Nitu <razvan.nitu1305@gmail.com> <razvan.nitu1305@gmail.com>
+Richard (Rikki) Andrew Cattermole <richard@cattermole.co.nz>
 Robert burner Schadek <robert.schadek@informatik.uni-oldenburg.de> <rburners@gmail.com>
 Robert burner Schadek <robert.schadek@informatik.uni-oldenburg.de> <robert.schadek@informatik.uni-oldenburg.de>
 Roy Margalit <54061433+rymrg@users.noreply.github.com>