Fixes for geo binding weirdness
Merge branch 'master' of github.com:groetzingrolf/gotterdammerung