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