Merge pull request #1 from tvheadend/master

Rebase