Really merged with upstream - fixed browser plugin load issue