[vdr-markad/f39] (19 commits) ...Merge branch 'master' into f39