Conflicts: htdocs/group/view.php htdocs/lang/en.utf8/mahara.php htdocs/lib/group.php htdocs/search/internal/lib.php