GIS: Fix issue with no_popups
Bugfix
Merge branch 'master' of git://github.com/flavour/eden