remove height if we have a page-break.
Merge branch 'master' into gh-pages