Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into nyc-dev