Imported Upstream version 1.0.4g
Imported Upstream version 1.0.4h