Merge branch 'trac-874-backport' of dbaston/geos into svn-3.6

Found errors in your .gitlab-ci.yml:

  • Undefined error
You can also test your .gitlab-ci.yml in CI Lint