[mythtv/el7: 4/4] Merge remote-tracking branch 'origin/master' into el7