Imported Upstream version 1.0.4a
Imported Upstream version 1.0.4b