merge recent commits from goenode/geonode