Merge branch 'master' into surface-mass-matrix