Merge branch 'master' into dev

diff --cc .travis.yml
index 8f22389bf28c5e196ea6c1c78f0597380ae88c62,53ded2b9502b90a83c705233fe02985790b3c7ce..69c0e4e90836f8bd8f837027a91ee98c5f6b8edf
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -23,13 -21,18 +23,21 @@@ matrix
            packages:
              - nasm
      - os: linux
 +      dist: trusty
        compiler: gcc
 -      env: CONFIGURE_FLAGS="--with-12bit"
 +      env: CMAKE_FLAGS="-DWITH_12BIT=1"
+     - os: linux
++      dist: trusty
+       compiler: gcc
 -      env: CONFIGURE_FLAGS="--with-jpeg7"
++      env: CMAKE_FLAGS="-DWITH_JPEG7=1"
+       addons:
+         apt:
+           packages:
+             - nasm
      - os: linux
 +      dist: trusty
        compiler: gcc
 -      env: CONFIGURE_FLAGS="--with-jpeg8"
 +      env: CMAKE_FLAGS="-DWITH_JPEG8=1"
        addons:
          apt:
            packages:

diff --cc ChangeLog.md
Simple merge

diff --cc jversion.h
index d0993ba8c88ab394ffcfa697aa360cd1eb0f689f,7e44eaa3c566493b78381b3ad6ba9b92f2c7de7e..7bb8ff420a87a442eb693ae5c35d85522840de18
--- 1/jversion.h
--- 2/jversion.h
+++ b/jversion.h
@@@ -35,10 -35,9 +35,10 @@@
   *   their code
   */
  
- #define JCOPYRIGHT      "Copyright (C) 2009-2016 D. R. Commander\n" \
+ #define JCOPYRIGHT      "Copyright (C) 2009-2017 D. R. Commander\n" \
                          "Copyright (C) 2011-2016 Siarhei Siamashka\n" \
                          "Copyright (C) 2015-2016 Matthieu Darbois\n" \
 +                        "Copyright (C) 2015 Intel Corporation\n" \
                          "Copyright (C) 2015 Google, Inc.\n" \
                          "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
                          "Copyright (C) 2013 Linaro Limited\n" \