Imported Upstream version 2.0.6
Imported Upstream version 2.0.7