Home folder is now set properly
Merging with upstream version of master