Merge remote-tracking branch 'libretro/master'