Imported Upstream version 0.6
Merge tag 'upstream/0.6'

Upstream version 0.6
upload to unstable