Correct handling of WeakReference so they are correctly removed from the list. Fixes #1991
Set _selfReference to null after removing it from the collection
Merge pull request #2375 from danzel/fix-1991

Correct handling of WeakReference so they are correctly removed from the list