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