Merge branch '64bitint'