Merge branch 'uuid' (lib/uuid fixes from Andy)