Make user_info work
Merge branch 'master' into vagrant