5fda960ebe
Merge commit 'f22875368c9909a36c47575f2f8c08f2ba4da549' * commit 'f22875368c9909a36c47575f2f8c08f2ba4da549': Change name for home's uid to something more generic.