Update for merge with master

Also fix masking of interpolated unstructured data