Migrating comment feeds to non-comment feeds.
Merge branch 'master' into circular

* master:
  Migrating comment feeds to non-comment feeds.