Merge branch 'master' into dev

diff --cc ChangeLog.md
Simple merge

diff --cc jchuff.c
index e1bd1c03bf391b32a7703d497d7662c522ea0012,526203e3db73b688ed67c900b0f80f59da953bcc..fe9d4f84380da3cf39c4f47d72d9852f0889d5b4
--- 1/jchuff.c
--- 2/jchuff.c
+++ b/jchuff.c
@@@ -4,9 -4,8 +4,9 @@@
   * This file was part of the Independent JPEG Group's software:
   * Copyright (C) 1991-1997, Thomas G. Lane.
   * libjpeg-turbo Modifications:
-  * Copyright (C) 2009-2011, 2014-2016, 2018, D. R. Commander.
+  * Copyright (C) 2009-2011, 2014-2016, 2018-2019, D. R. Commander.
   * Copyright (C) 2015, Matthieu Darbois.
 + * Copyright (C) 2018, Matthias Räncker.
   * For conditions of distribution and use, see the accompanying README.ijg
   * file.
   *