Refs #415. Fixed the x86/i386 compiling bug with DYNAMIC_ARCH=1.
Merge branch 'develop'