Return a string from user.name always to avoid any complications with other functions calling gsub on the result. SafeBuffer won't work with gsub until Rails 3.2 https://github.com/rails/rails/commit/b4a6e2f8442ceda118367f9a61c38af754be1cbf
Merge branch 'hotfix/0.9.0.5'