[mythtv/el7: 43/43] Merge master into el7