Merge pull request #3542 from xhaggi/epg-time-indicator