Finding a rogue carrot.
Merge branch 'site-fixes' into gh-pages