Don't show manhamsterfish until it's called for.

Merge branch 'local-master'