Match feed_id with feed_uri
Feed object doesn't have feed_id attribute.
Merge branch '0.1-maintenance'