Merge tag 'upstream/0.3' into debian

Upstream version 0.3