Imported Upstream version 1.6.0.3
Imported Upstream version 1.6.0.3