Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Fix some ambiguity

Amos
Merge branch 'article/missed_a_comma' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'