Merge branch 'libretro' into libretro-reset