(cherry picked from commit 7c6c97b1e8bc9672e13c2da32eab91afd0d9c91d)

Conflicts:

	htdocs/theme/raw/templates/group/membersearchresults.tpl
	htdocs/theme/raw/templates/group/view.tpl