Merge remote-tracking branch 'mvo/debian/sid' into debian/sid