merge omnirom upstream