Merge branch 'master' into dev

diff --cc CMakeLists.txt
Simple merge

diff --cc ChangeLog.md
index 28ace131fceab3d85d60d2fe0c689c68be4cbb1e,406c6db272c4ec78cc8d225f5bf2c2420e18202e..98ca0aefc2060ce7839edf19175146083b614e8d
--- 1/ChangeLog.md
--- 2/ChangeLog.md
+++ b/ChangeLog.md
@@@ -101,6 -7,10 +101,10 @@@ to decompress a specially-crafted malfo
  pose a security threat, but removing the warnings makes it easier to detect
  actual security issues, should they arise in the future.
  
 -2. Fixed a bug in the merged 4:2:0 upsampling/dithered RGB565 color conversion
++11. Fixed a bug in the merged 4:2:0 upsampling/dithered RGB565 color conversion
+ algorithm that caused incorrect dithering in the output image.  This algorithm
+ now produces bitwise-identical results to the unmerged algorithms.
+ 
  
  1.5.3
  =====