fix for parsing CD's improperly escaped HTML
Merge remote-tracking branch 'upstream/master'