Merge branch 'fix-pnglibconf-on-osx' of git://github.com/aseprite/libpng into libpng16