Merge branch '1.4.x'

diff --cc ChangeLog.txt
index ccff54fbb0a9027f4b048d2d667b1a9bf009fcfa,90e67f3b844c12f385b63cdbeaea2b00fed63886..8adad4b66035f2b4ccdebbae6f51f345fbea42ff
--- 1/ChangeLog.txt
--- 2/ChangeLog.txt
+++ b/ChangeLog.txt
@@@ -112,6 -19,9 +112,9 @@@ to construct a JPEG image in which a si
  long, so this version of libjpeg-turbo activates the accelerated Huffman
  decoder only if there are > 512 bytes of data in the input buffer.
  
 -[3] Fixed a memory leak in tjunittest encountered when running the program
++[18] Fixed a memory leak in tjunittest encountered when running the program
+ with the -yuv option.
+ 
  
  1.4.2
  =====