bugfix: on osx/linux the environment variable is just called "USER"
Merge remote-tracking branch 'origin/unix-compat'