Merge "Replace MimeMagic::singleton() calls"