Merge "64bit mach-o support"