Imported Upstream version 2.0.5
Imported Upstream version 2.0.6