Merge branch 'libpng15-20151123' of git://github.com/jbowler/libpng-1 into libpng15