Merge pull request #4984 from leoetlino/content-fixes IOS/ES: Title import fixes + hack removals (fix for System Menu disc updates)