BF: resolved committed merge conflicts in favor of TVHEADEND v3.4