Update geo

I tried to merge develop into geo. However I have no running geo installation to test this.