Fix the Geospace build (I think)
Merge branch 'master' into urmilan/index-georegions-for-suggestion