- Merged Cedric's user namespace patches