Imported Upstream version 2.0.5
Merge tag 'upstream/2.0.5'

Upstream version 2.0.5