Imported Upstream version 0.4
Merge tag 'upstream/0.4'

Upstream version 0.4