Imported Upstream version 0.4
Imported Upstream version 0.6
Merge tag 'upstream/0.6'

Upstream version 0.6
Release 0.6-1