[xmltv/el6] (3 commits) ...Merge branch 'master' into el6