Merge branch 'debian-0.1' into debian