Merge commit 'debian/3.0_a17-1' into debian