Preventing infinite loop on merged dupe feeds.
Merge branch 'master' into circular

* master:
  Preventing infinite loop on merged dupe feeds.