merge mythtv master