Merge pull request #820 from simod/fix-issue-819

Fix issue #819
Merge branch 'master' of https://github.com/GeoNode/geonode