Merge branch 'fix-error-500-groups-with-avatar' into 'master'

Fix Error 500 in API when accessing a group that has an avatar

Closes #2340

See merge request !1189