Install: Use Dir.home if possible
Merge branch 'master' into oucs