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

Upstream version 1.0.4c
new version, 1.0.4c