[xmltv/el6: 38/39] Merge branch 'master' into el6