Merge pull request #1553 from alex/hide-the-eggs

Hide the eggs!