(cherry picked from commit d6abced4) Conflicts: htdocs/blocktype/myfriends/theme/default/myfriends.tpl