Blackout Memphis: One more not so small one...

Patch to v1.21 Various bug fixes after the major update