[mythtv/el7: 10/10] Merge branch 'master' into el7