Merge branch 'master' into libpng

.travis.yml

@@ -56,6 +56,13 @@ matrix:
       env:
         - MB_PYTHON_VERSION=3.5
         - PLAT=i686
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+        - PLAT=i686
     - os: osx
       language: generic
       env: MB_PYTHON_VERSION=2.7
@@ -73,6 +80,10 @@ matrix:
       language: generic
       env:
         - MB_PYTHON_VERSION=3.5
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.6
 
 before_install:
     - source multibuild/common_utils.sh

Pillow

@@ -1 +1 @@
-Subproject commit 1161d2054899ba2d9955870ad425553e7f0884ac
+Subproject commit a021d4978dd96371557f21c7b68feff2056a6e9b

config.sh

@@ -4,12 +4,12 @@
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.6.5
 LIBPNG_VERSION=1.6.26
-ZLIB_VERSION=1.2.8
+ZLIB_VERSION=1.2.9
 JPEG_VERSION=9b
 OPENJPEG_VERSION=2.1
-TIFF_VERSION=4.0.6
+TIFF_VERSION=4.0.7
 LCMS2_VERSION=2.8
-LIBWEBP_VERSION=0.5.1
+LIBWEBP_VERSION=0.5.2
 
 function pre_build {
     # Any stuff that you need to do before you start building the wheels

multibuild

@@ -1 +1 @@
-Subproject commit db8f384596bbe436efdfa205f181f6c5209abbc4
+Subproject commit 93ec510830049fbf96f3ebaafdb3799b9e9b037d