Merge pull request #1026 from uraimo/no-more-powerpc