[xmltv] (5 commits) ...Merge branch 'master' into el7