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