Merge pull request #166 from emilyhahn/master

Bring MFLM / sio mule common up to date