Add base line-height
Merge branch 'master' into ie8-support