Merge branch 'master' into geotrans_wkt

2 jobs for !195 with geotrans_wkt in 2 minutes and 46 seconds (queued for 5 seconds)
latest merge request