[vdr-markad/f40: 2/2] Merge branch 'master' into f40