Imported Upstream version 2.0.5
Merge tag 'upstream/2.0.5'

Upstream version 2.0.5
Imported Upstream version 2.0.6
Merge tag 'upstream/2.0.6'

Upstream version 2.0.6
new upstream release 2.0.6
Merged vdr 2.0.6 from master