Restored geometry server to proxy configuration
Merge branch 'master' into develop