fix #4270: NullPointerException in CGeoMap
Merge branch 'release' into upstream