Fix OS X compatability
Merge branch 'master' of https://github.com/oysteinkrog/userprofile-global