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