am 2842ca8a: am bcb14ce1: (-s ours) Compiling issue fix since SurfTex header changed.

* commit '2842ca8ac63ad5e7b6a6eb89285d14db424c2bab':
  Compiling issue fix since SurfTex header changed.