typo fix
Merge branch 'master' into trigger-happy-rss-0.1.0