Sync with latest MAME