Merge branch 'debian/sid' into ubuntu/master