[vdr-markad/f39: 19/19] Merge branch 'master' into f39