Merge pull request #665 from QuarkTheAwesome/libretro-merge-be