Merge branch 'master' into dev

diff --cc .travis.yml
Simple merge

diff --cc CMakeLists.txt
Simple merge

diff --cc ChangeLog.md
Simple merge

diff --cc cmakescripts/BuildPackages.cmake
Simple merge

diff --cc jdsample.c
index 15be7aa24aafe4b5adbacf69f65e0a3e78f16357,50a68b30131890bec2f56e350b4eda25aa66fd5b..da8f151436baa2746ca7f1215b02f05048417960
--- 1/jdsample.c
--- 2/jdsample.c
+++ b/jdsample.c
@@@ -334,8 -338,8 +338,8 @@@ h1v2_fancy_upsample(j_decompress_ptr ci
        outptr = output_data[outrow++];
  
        for (colctr = 0; colctr < compptr->downsampled_width; colctr++) {
 -        thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
 +        thiscolsum = (*inptr0++) * 3 + (*inptr1++);
-         *outptr++ = (JSAMPLE)((thiscolsum + 1) >> 2);
+         *outptr++ = (JSAMPLE)((thiscolsum + bias) >> 2);
        }
      }
      inrow++;

diff --cc release/makemacpkg.in
index d499ef479003b3f9b4697e5e1546978321fac214,42b455d2b0f70ab22b4584ac76a52f7adf0cbd41..e5e9c5611366bdc75e2e40b6df2ecb206d250b50
--- 1/release/makemacpkg.in
--- 2/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@@ -54,8 -54,12 +54,10 @@@ VERSION=@VERSION
  BUILD=@BUILD@
  SRCDIR=@CMAKE_CURRENT_SOURCE_DIR@
  BUILDDIR32=@OSX_32BIT_BUILD@
 -BUILDDIRARMV7=@IOS_ARMV7_BUILD@
 -BUILDDIRARMV7S=@IOS_ARMV7S_BUILD@
  BUILDDIRARMV8=@IOS_ARMV8_BUILD@
  WITH_JAVA=@WITH_JAVA@
+ OSX_APP_CERT_NAME="@OSX_APP_CERT_NAME@"
+ OSX_INST_CERT_NAME="@OSX_INST_CERT_NAME@"
  LIPO=lipo
  
  PREFIX=@CMAKE_INSTALL_PREFIX@

diff --cc simd/CMakeLists.txt
Simple merge