#fixed line height of text.
Merge origin/gh-pages into gh-pages