Support x86

This branch tracks support for the x86 platform for the 1.5 branch.

Don't merge this pull request, this should be done in Mercurial, if accepted.