Merge branch 'geometry_fortify' into 'master'

Resolve memory leak.

See merge request !104
8 jobs for master in 19 minutes and 2 seconds