Merge pull request #378 from pcercuei/libretro