[xmltv/el7: 23/24] Merge commit 'c2e16c0511f75019757e1acd2b3' into el7