Commit c68f20cecc24dbe734e4167e2cf8b90ff776aabd

John Bowler 2016-01-18T10:50:46

Merge branch 'libpng16' into libpng16-simple-memory-II