Fixing small bug for feeds that have no feed link.
Merge branch 'master' into circular

* master:
  Fixing small bug for feeds that have no feed link.