Imported Upstream version 2.0.4
Merge tag 'upstream/2.0.4'

Upstream version 2.0.4
new upstream release vdr 2.0.4
Merge branch 'master' into yavdr-0.5