Add some more checks to avoid problems when iTunesArtwork is not a .png.
Merge branch 'release/3.5.1'