BUG: handle linux platforms where machine() returns i386/i686.
Merge branch 'fix_win32_arch_guessing'