Merge branch 'geom_routines' into 'master'

Geom routines

See merge request futility/Futility!342
1 job for master in 1 minute and 58 seconds (queued for 2 seconds)