Merge "Cleaner logging in a 32/64 bit world"