Update mesh_surface

This didn't seem to merge properly