Merge branch 'libretro'