Fix self linking of objects returned in lists.
Merge pull request #2082 from lavalamp/fix

Fix self linking of objects returned in lists.