Merge branch 'master' into dev

24 jobs for dev in 1 minute and 9 seconds (queued for 6 seconds)
Name Stage Failure
failed
libretro-build-windows-msvc05-i686 Build Shared
No job log
failed
libretro-build-windows-msvc10-i686 Build Shared
No job log
failed
libretro-build-windows-msvc10-x64 Build Shared
No job log