Imported Upstream version 1.6.0.5
Imported Upstream version 1.6.0.5