Word wrap on current user infos
Merge branch 'master' into production