Imported Upstream version 0.5
Merge tag 'upstream/0.5' into debian-debian

Upstream version 0.5