Don't let penguin go off-screen.
Merge branch 'master' into gh-pages