Imported Upstream version 1.0.4
Merge tag 'upstream/1.0.4'

Upstream version 1.0.4
Finalize changelog