Merge branch 'libretro' into upstream