syncing with martin for article toggle
Merge branch 'master' of https://github.com/martianmartin/myStream