Merge pull request #1919 from sairon/tvheadend-update