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