Merge branch 'next' into dfsg-debian