Show comment count below comment icon.
Merge branch 'master' into gh-pages