Imported Upstream version 0.04
Merge tag 'upstream/0.04'

Upstream version 0.04
finalize changelog