am cf3f2874: Merge "Better support for 64-bit clearsilver build."

* commit 'cf3f2874c82573449a64fa2b285b97189de0da68':
  Better support for 64-bit clearsilver build.