Merge pull request #33 from wajam/olivier-mry-codec

Cleanup migration leftovers