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