Update from scummvm/scummvm