Merge pull request #2019 from directhex/powerpc-fixes