Merge branch 'master' into feed-warning
add "feed URL is like a password" text
Merge pull request #396 from Trott/feed-warning

Feed warning