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