Merge "Allow mixing of thread offsets between 32 and 64bit architectures."