fixed line height
Merge branch 'staging_stage2' into gh-pages