Imported Upstream version 1.0.4d
Imported Upstream version 1.0.4d
Imported Upstream version 1.0.4d
Merge tag 'upstream/1.0.4d'

Upstream version 1.0.4d
new release, 1.0.4d