Merge pull request #3707 from popcornmix/omx_cosmetic