Imported Upstream version 5.0.1
Merge branch 'upstream' into debian/sid