Get rid of cost of rendering text.
Merge branch 'master' into gh-pages