Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master