Merge branch '1.4.x'
diff --git a/jidctflt.c b/jidctflt.c
index 2b2e228..324a2cb 100644
--- a/jidctflt.c
+++ b/jidctflt.c
@@ -6,7 +6,7 @@
  * Modified 2010 by Guido Vollbeding.
  * libjpeg-turbo Modifications:
  * Copyright (C) 2014, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README file.
+ * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains a floating-point implementation of the
  * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
diff --git a/jstdhuff.c b/jstdhuff.c
index b29e5ea..a6eb2d8 100644
--- a/jstdhuff.c
+++ b/jstdhuff.c
@@ -1,15 +1,15 @@
 /*
-* jstdhuff.c
-*
-* This file was part of the Independent JPEG Group's software:
-* Copyright (C) 1991-1998, Thomas G. Lane.
-* libjpeg-turbo Modifications:
-* Copyright (C) 2013, D. R. Commander.
-* For conditions of distribution and use, see the accompanying README file.
-*
-* This file contains routines to set the default Huffman tables, if they are
-* not already set.
-*/
+ * jstdhuff.c
+ *
+ * This file was part of the Independent JPEG Group's software:
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2013, D. R. Commander.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to set the default Huffman tables, if they are
+ * not already set.
+ */
 
 /*
  * Huffman table setup routines