TVHeadend merge conflict-2