Make notes more like article in feeds (with guid and title)
Merge remote-tracking branch 'upstream/master'