ALL: synced with scummvm
Merge remote-tracking branch 'residualvm/master'