ALL: sync with scummvm