Merge pull request #6947 from JosJuice/unencrypted-wii-disc Make the support for unencrypted Wii disc images less broken