Merge remote-tracking branch 'nickva/fix-largeint-type'