[vdr-markad/f40] (18 commits) ...Merge branch 'master' into f40