log changes
Merge branch 'debian-v3.x' into debian-uuid