merge upstream wiiuse changes in submodule