fix http 304 header being calculated incorrectly for published and starred feeds
Merge remote-tracking branch 'upstream/master'