Apply 1659126: fix Win32 icon generation with png2ico. Patch by Dmitriy Pomerantsev...