FIX: N+1 query for avatars
Merge pull request #1325 from ZogStriP/fix-n-plus-one-query-for-avatars

FIX: N+1 query for avatars