Sixstring982/MFMv2 — pull request #48 by DaveAckley (2014-08-26 17:26:21+00:00)
Title: Redo locking

Plus misc other stuff that crawled in