Merge "Better support for 64-bit clearsilver build."