Work with Spire master.
Forgot that Visual Studio doesn't support initializer lists.
Merge remote-tracking branch 'origin/trisurf' into trisurf