[xmltv/el6: 3/3] Merge branch 'master' into el6