Applying uid/gid fix from trunk.