[CatsEye Settings] Removed from feeds due to advertisement inside bouquets.
Merge remote-tracking branch 'upstream/2.3' into 2.3