horgh Merge pull request #158 from maxmind/greg/test-i386-again