merge from libretro fork