When loading someone else feed, only include its events
Merge branch 'master' into stable