Nuku/Flexible-Survival — pull request #468 by TigerStripes (2012-10-05 14:53:38+00:00)
Title: Omio Repairs

Some patching from Kaleem that I've further tweaked.