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

Upstream version 1.0.5