Merge branch 'surface-mass-matrix' into surface-face-matrix