[mythtv/el7] (6 commits) ...Merge branch 'el7'