Merge pull request #6981 from neheb/png