Merge branch 'devel' into debian-devel