Pull latest changes

Should fix Mega CD save states