am c21843a8: Merge "fix Surface positions are not floats"

* commit 'c21843a8b5c395cbaae6db0f786bdee556075f5d':
  fix Surface positions are not floats