Merge branch 'master' into dev

diff --cc CMakeLists.txt
Simple merge

diff --cc ChangeLog.md
index eea7dd8e5b4d7b1b8209b1b38e2b6097f852e29b,ebe26b66451ebf5bf547fcf6a53b246c72694037..bb29d4173a5d04aaa7eea81eb9667ba0da8fb289
--- 1/ChangeLog.md
--- 2/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,22 -1,28 +1,47 @@@
 +2.1 pre-beta
 +============
 +
 +### Significant changes relative to 2.0.1:
 +
 +1. The build system, x86-64 SIMD extensions, and accelerated Huffman codec now
 +support the x32 ABI on Linux, which allows for using x86-64 instructions with
 +32-bit pointers.  The x32 ABI is generally enabled by adding `-mx32` to the
 +compiler flags.
 +
 +     Caveats:
 +     - CMake 3.9.0 or later is required in order for the build system to
 +automatically detect an x32 build.
 +     - Java does not support the x32 ABI, and thus the TurboJPEG Java API will
 +automatically be disabled with x32 builds.
 +     - SIMD acceleration for progressive Huffman encoding does not (currently)
 +work with the x32 ABI and will be disabled in x32 builds.
 +
 +
+ 2.0.2
+ =====
+ 
+ ### Significant changes relative to 2.0.1:
+ 
+ 1. Fixed a regression introduced by 2.0.1[5] that prevented a runtime search
+ path (rpath) from being embedded in the libjpeg-turbo shared libraries and
+ executables for macOS and iOS.  This caused a fatal error of the form
+ "dyld: Library not loaded" when attempting to use one of the executables,
+ unless `DYLD_LIBRARY_PATH` was explicitly set to the location of the
+ libjpeg-turbo shared libraries.
+ 
+ 2. Fixed an integer overflow and subsequent segfault (CVE-2018-20330) that
+ occurred when attempting to load a BMP file with more than 1 billion pixels
+ using the `tjLoadImage()` function.
+ 
+ 3. Fixed a buffer overrun (CVE-2018-19664) that occurred when attempting to
+ decompress a specially-crafted malformed JPEG image to a 256-color BMP using
+ djpeg.
+ 
+ 4. Fixed a floating-point exception that occurred when attempting to
+ decompress a specially-crafted malformed JPEG image with a specified image
+ width or height of 0 using the C version of TJBench.
+ 
+ 
  2.0.1
  =====