Merge pull request #1663 from hurtonm/master

.mailmap

@@ -5,6 +5,8 @@ Chernyshev Vyacheslav <astellar@ro.ru> Astellar <astellar@ro.ru>
 Chris Laws <clawsicus@gmail.com> Chris Laws <claws@localhost>
 Chris Staite <chris@yourdreamnet.co.uk> Chris <chris@yourdreamnet.co.uk>
 Christoph Zach <czach@rst-automation.com> czach <czach@rst-automation.com>
+Chuck Remes <git@chuckremes.com> Chuck Remes <cremes@mac.com>
+Chuck Remes <git@chuckremes.com> Chuck Remes <cremes.devlist@mac.com>
 Constantin Rack <constantin.rack@gmail.com> Constantin Rack <constantin@rack.li>
 Constantin Rack <constantin.rack@gmail.com> Constantin Rack <c-rack@users.noreply.github.com>
 Daniel Krikun <krikun.daniel@gmail.com> danielkr <krikun.daniel@gmail.com>
@@ -47,7 +49,7 @@ Martin Sustrik <sustrik@250bpm.com> unknown <sustrik@.(none)>
 Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@turist.(none)>
 Maurice Barnum <msb@yahoo-inc.com> maurice barnum <msb@yahoo-inc.com>
 Maurizio Melato <maurizio.melato@nice-software.com> unknown <mauri@okinawa.(none)>
-Max Skaller <max.skaller@gmail.com> skaller <Max.Skaller@gmail.com>
+Max Skaller <Max.Skaller@gmail.com> skaller <Max.Skaller@gmail.com>
 Michael Fox <415fox@gmail.com> m <415fox@gmail.com>
 Michael Hand <mipa@matrix.by> Mipa <mipa@matrix.by>
 Michel Zou <xantares10@hotmail.com> xantares <xantares09@hotmail.com>