No need for OELightStyleGridViewMenu
Merge remote-tracking branch 'upstream/master'