Merge "Fix stacks on 64 bit processes."