Merge pull request #3111 from janbar/epg_timeslot