[mythtv/el7] Merge master into el7