Update native code for 32 and 64 bits.
Merge remote-tracking branch 'origin/master'