Background feed refresh revisited, fix for empty feeds
Merge remote-tracking branch 'origin/master'