[mythtv/el7] (43 commits) ...Merge master into el7